From b79895c9d6c6c6cae6b9aa97f5d303e08d057fbe Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@etherboot.org>
Date: Sun, 17 Apr 2005 15:57:34 +0000
Subject: [PATCH] Use mkconfig.pl to generate fragments from config.h

Don't use -MP to generate phony rules for included files, otherwise
make won't use the pattern rule for config/%.h.  :(
---
 src/Makefile.housekeeping | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping
index 92a5c528..1dfc34d1 100644
--- a/src/Makefile.housekeeping
+++ b/src/Makefile.housekeeping
@@ -50,6 +50,11 @@ oldgas :
 #
 CFLAGS	+= -include compiler.h
 
+# config/%.h files are generated from config.h using mkconfig.pl
+config/%.h : config.h
+	$(MKCONFIG) $<
+CLEANUP	+= config/*.h
+
 # SRCDIRS lists all directories containing source files.
 srcdirs :
 	@echo $(SRCDIRS)
@@ -104,8 +109,7 @@ endef
 define obj_template
 
 	@$(CPP) $(CFLAGS) $(CFLAGS_$(3)) $(CFLAGS_$(4)) \
-		-M $(1) -MT "$(4)_DEPS" -MG -MP | \
-		sed 's/$(4)_DEPS[[:space:]]*:/$(4)_DEPS =/' >> $(2)
+		-M $(1) -MT "$(4)_DEPS" -MG | tr : = >> $(2)
 	@echo -e '\n$$(BIN)/$(4).o : $(1) $$(MAKEDEPS) $$($(4)_DEPS)' \
 		 '\n\t$$(RULE_$(3))\n' \
 		 '\nBOBJS += $$(BIN)/$(4).o\n' \