summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile33
1 files changed, 17 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index 433ce96b0..e46eee5ba 100644
--- a/Makefile
+++ b/Makefile
@@ -81,6 +81,7 @@ ifeq ($(NODEP),)
$(BUILD_DIR)/data/%.o: ASM_DEP = $(shell $(SCANINC) data/$(*F).s)
endif
+MAKEFLAGS += --no-print-directory
# Secondary expansion is required for dependency variables in object rules.
.SECONDEXPANSION:
# Clear the default suffixes
@@ -111,13 +112,13 @@ clean: tidy
$(MAKE) clean -C tools/ramscrgen
tools:
- $(MAKE) -C tools/gbagfx
- $(MAKE) -C tools/scaninc
- $(MAKE) -C tools/preproc
- $(MAKE) -C tools/bin2c
- $(MAKE) -C tools/rsfont
- $(MAKE) -C tools/aif2pcm
- $(MAKE) -C tools/ramscrgen
+ @$(MAKE) -C tools/gbagfx
+ @$(MAKE) -C tools/scaninc
+ @$(MAKE) -C tools/preproc
+ @$(MAKE) -C tools/bin2c
+ @$(MAKE) -C tools/rsfont
+ @$(MAKE) -C tools/aif2pcm
+ @$(MAKE) -C tools/ramscrgen
tidy:
$(RM) $(ALL_BUILDS:%=poke%{.gba,.elf,.map})
@@ -148,15 +149,15 @@ $(BUILD_DIR)/%.o: %.s $$(ASM_DEP)
$(AS) $(ASFLAGS) $< -o $@
# "friendly" target names for convenience sake
-ruby: ; @$(MAKE) --no-print-directory GAME_VERSION=RUBY
-ruby_rev1: ; @$(MAKE) --no-print-directory GAME_VERSION=RUBY GAME_REVISION=1
-ruby_rev2: ; @$(MAKE) --no-print-directory GAME_VERSION=RUBY GAME_REVISION=2
-sapphire: ; @$(MAKE) --no-print-directory GAME_VERSION=SAPPHIRE
-sapphire_rev1: ; @$(MAKE) --no-print-directory GAME_VERSION=SAPPHIRE GAME_REVISION=1
-sapphire_rev2: ; @$(MAKE) --no-print-directory GAME_VERSION=SAPPHIRE GAME_REVISION=2
-ruby_de: ; @$(MAKE) --no-print-directory GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN
-sapphire_de: ; @$(MAKE) --no-print-directory GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN
-ruby_de_debug: ; @$(MAKE) --no-print-directory GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN DEBUG=1
+ruby: ; @$(MAKE) GAME_VERSION=RUBY
+ruby_rev1: ; @$(MAKE) GAME_VERSION=RUBY GAME_REVISION=1
+ruby_rev2: ; @$(MAKE) GAME_VERSION=RUBY GAME_REVISION=2
+sapphire: ; @$(MAKE) GAME_VERSION=SAPPHIRE
+sapphire_rev1: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_REVISION=1
+sapphire_rev2: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_REVISION=2
+ruby_de: ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN
+sapphire_de: ; @$(MAKE) GAME_VERSION=SAPPHIRE GAME_LANGUAGE=GERMAN
+ruby_de_debug: ; @$(MAKE) GAME_VERSION=RUBY GAME_LANGUAGE=GERMAN DEBUG=1
#### Graphics Rules ####