From 2baaf80989de573c9c8d44407e1de697b543127e Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi@gmail.com>
Date: Sun, 20 Sep 2020 17:43:24 -0400
Subject: Port simpler tools/make_shim.py from pokepicross

---
 Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index da3e74b..bf53a31 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,7 @@ RGBLINK ?= $(RGBDS)rgblink
 RGBASMFLAGS := -h -E -i $(BUILD)/ -DGOLD
 
 SCAN_INCLUDES := tools/scan_includes
+MAKE_SHIM := tools/make_shim.py
 
 tools/gfx :=
 
@@ -49,18 +50,18 @@ tools tools/pkmncompress tools/gfx tools/scan_includes:
 # Remove files generated by the build process.
 .PHONY: clean
 clean:
-	rm -rf $(ROM) $(CORRECTEDROM) $(BUILD) $(ROMS:.gb=.sym) $(ROMS:.gb=.map)
+	rm -rf $(ROM) $(CORRECTEDROM) $(ROMS:.gb=.sym) $(ROMS:.gb=.map) $(BUILD)
 	"$(MAKE)" -C tools clean
 
 # Remove generated files except for graphics.
 .PHONY: tidy
 tidy:
-	rm -rf $(ROM) $(CORRECTEDROM) $(OBJS) $(ROMS:.gb=.sym) $(ROMS:.gb=.map)
+	rm -rf $(ROM) $(CORRECTEDROM) $(ROMS:.gb=.sym) $(ROMS:.gb=.map) $(OBJS) $(BUILD)/shim.asm
 
 # Visualize disassembly progress.
 .PHONY: coverage
-coverage: $(ROM:.gb=.map) utils/coverage.py
-	$(PYTHON) utils/coverage.py $<
+coverage: $(ROM:.gb=.map)
+	utils/coverage.py $<
 
 
 %.map: %.gb
@@ -78,8 +79,8 @@ $(BASEROM):
 	@echo "Please obtain a copy of Gold_debug.sgb and put it in this directory as $@"
 	@exit 1
 
-$(BUILD)/shim.asm: tools/make_shim.py shim.sym | $$(dir $$@)
-	$(PYTHON) tools/make_shim.py -w $(filter-out $<, $^) > $@
+$(BUILD)/shim.asm: shim.sym | $$(dir $$@)
+	$(MAKE_SHIM) $< > $@
 
 $(BUILD)/%.o: $(BUILD)/%.asm | $$(dir $$@)
 	$(RGBASM) $(RGBASMFLAGS) $(OUTPUT_OPTION) $<
-- 
cgit v1.2.3