From 78c2f647945781b71e3867441e4626b93b2a35a3 Mon Sep 17 00:00:00 2001 From: yenatch Date: Sun, 4 Mar 2018 13:50:55 -0500 Subject: Fix duplicate make tools --- Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 94f45ea55..e8d8fff9a 100644 --- a/Makefile +++ b/Makefile @@ -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 -- cgit v1.2.3