diff options
author | yenatch <yenatch@gmail.com> | 2018-03-04 13:50:55 -0500 |
---|---|---|
committer | yenatch <yenatch@gmail.com> | 2018-03-04 14:28:47 -0500 |
commit | 78c2f647945781b71e3867441e4626b93b2a35a3 (patch) | |
tree | a762453a3c2813e55dc42fe7fcaaf50cff7321e5 | |
parent | d7162b00453760cab4e0cb8f09bdd9e3cfc78893 (diff) |
Fix duplicate make tools
-rw-r--r-- | Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -75,8 +75,11 @@ ALL_BUILDS := ruby ruby_rev1 ruby_rev1 sapphire sapphire_rev1 sapphire_rev2 ruby # Available targets .PHONY: all clean tidy tools $(ALL_BUILDS) +# Build tools when building the rom # Disable dependency scanning for clean/tidy/tools -ifneq (,$(filter clean tidy tools,$(MAKECMDGOALS))) +ifeq (,$(filter-out all,$(MAKECMDGOALS))) +$(info $(shell $(MAKE) tools)) +else NODEP := 1 endif @@ -88,11 +91,6 @@ ifeq ($(NODEP),) $(BUILD_DIR)/data/%.o: ASM_DEP = $(shell $(SCANINC) data/$(*F).s) endif -# Build tools when building the rom -ifeq (,$(filter clean tidy tools,$(MAKECMDGOALS))) -$(info $(shell $(MAKE) tools)) -endif - # Secondary expansion is required for dependency variables in object rules. .SECONDEXPANSION: # Clear the default suffixes |