From a839463c849679974c986bf9c9c260eff0e94cb7 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Tue, 1 Jun 2021 20:40:11 -0400
Subject: Optimize Makefile.

Don't do recursive makes for COMPARE and MODERN, use minimal makefile for making tools.
---
 make_tools.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 make_tools.mk

(limited to 'make_tools.mk')

diff --git a/make_tools.mk b/make_tools.mk
new file mode 100644
index 000000000..82a482bca
--- /dev/null
+++ b/make_tools.mk
@@ -0,0 +1,12 @@
+
+TOOLDIRS := $(filter-out tools/agbcc tools/binutils,$(wildcard tools/*))
+TOOLBASE = $(TOOLDIRS:tools/%=%)
+TOOLS = $(foreach tool,$(TOOLBASE),tools/$(tool)/$(tool)$(EXE))
+
+.PHONY: all $(TOOLDIRS)
+
+all: $(TOOLDIRS)
+	@:
+
+$(TOOLDIRS):
+	@$(MAKE) -C $@
-- 
cgit v1.2.3


From 92152e45e226b797a5ca10cff0e9e55d2a66a3d8 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Tue, 1 Jun 2021 23:22:15 -0400
Subject: Fixes to makefile.

Merge C_ASM_DEP and DATA_ASM_DEP, NODEP and SCAN_DEPS can be overridden, add --no-print-directory to MAKEFLAGS in make_tools.mk (also removed some unused variables), add newline to help message in preproc.
---
 make_tools.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'make_tools.mk')

diff --git a/make_tools.mk b/make_tools.mk
index 82a482bca..697897a69 100644
--- a/make_tools.mk
+++ b/make_tools.mk
@@ -1,12 +1,11 @@
 
+MAKEFLAGS += --no-print-directory
+
 TOOLDIRS := $(filter-out tools/agbcc tools/binutils,$(wildcard tools/*))
-TOOLBASE = $(TOOLDIRS:tools/%=%)
-TOOLS = $(foreach tool,$(TOOLBASE),tools/$(tool)/$(tool)$(EXE))
 
 .PHONY: all $(TOOLDIRS)
 
 all: $(TOOLDIRS)
-	@:
 
 $(TOOLDIRS):
 	@$(MAKE) -C $@
-- 
cgit v1.2.3