From e78034eb8c818036d2cb11c9b87ad8ae366be0cf Mon Sep 17 00:00:00 2001 From: yenatch Date: Mon, 29 May 2017 19:15:34 -0400 Subject: [PATCH] Use a separate makefile for tools - Fix crystal11 - Fix a bug where the dependency checks would run regardless of target Fixes 0bd74cdd7341a4cff5da73e1c32ac0d237ec8e08 --- Makefile | 12 +++++------- tools/Makefile | 13 +++++++++++++ 2 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 tools/Makefile diff --git a/Makefile b/Makefile index 52b7a4da5..81bafd55b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ MD5 := md5sum -c --quiet .SUFFIXES: -.PHONY: all clean tools crystal crystal11 +.PHONY: all clean tools compare crystal crystal11 .SECONDEXPANSION: .PRECIOUS: .SECONDARY: @@ -38,13 +38,11 @@ clean: compare: pokecrystal.gbc pokecrystal11.gbc @$(MD5) roms.md5 -tools: tools/lzcomp tools/png_dimensions tools/scan_includes tools/palette tools/pokemon_animation tools/pokemon_animation_graphics ; +tools: + make -C tools/ -tools/%: tools/%.c - $(CC) -o $@ $< - -$(crystal11_obj): dep = $(shell tools/scan_includes $(@D)/$*.asm) -$(crystal11_obj): %11.o: %.asm $$(dep) +%11.o: dep = $(shell tools/scan_includes $(@D)/$*.asm) +%11.o: %.asm $$(dep) rgbasm -D CRYSTAL11 -o $@ $< %.o: dep = $(shell tools/scan_includes $(@D)/$*.asm) diff --git a/tools/Makefile b/tools/Makefile new file mode 100644 index 000000000..4a04027fc --- /dev/null +++ b/tools/Makefile @@ -0,0 +1,13 @@ +.PHONY: all + +all: \ + lzcomp \ + png_dimensions \ + scan_includes \ + palette \ + pokemon_animation \ + pokemon_animation_graphics + @: + +%: %.c + $(CC) -o $@ $<