From f721067d3565bfec4cca1f65e5be3ce8112de938 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Fri, 17 Apr 2009 13:43:35 +0100 Subject: [PATCH] [build] Kill off the multiple-object-per-source-file mechanism Now that there are no remaining multiple-object source files, kill off the mechanism in order to simplify the Makefile. --- src/Makefile.housekeeping | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping index 9b7d1632..24005bdc 100644 --- a/src/Makefile.housekeeping +++ b/src/Makefile.housekeeping @@ -419,23 +419,6 @@ define src_template @$(MKDIR) -p $(dir $(2)) @$(RM) $(2) @$(TOUCH) $(2) - $(foreach OBJ,$(if $(OBJS_$(4)),$(OBJS_$(4)),$(4)), \ - $(call obj_template,$(1),$(2),$(3),$(OBJ))) - @$(PARSEROM) $(1) >> $(2) - -endef - -# obj_template : generate Makefile rules for a given resultant object -# of a particular source file. (We can have multiple objects per -# source file via the OBJS_xxx list.) -# -# $(1) is the full path to the source file (e.g. "drivers/net/rtl8139.c") -# $(2) is the full path to the .d file (e.g. "bin/deps/drivers/net/rtl8139.d") -# $(3) is the source type (e.g. "c") -# $(4) is the object name (e.g. "rtl8139") -# -define obj_template - @$(CPP) $(CFLAGS) $(CFLAGS_$(3)) $(CFLAGS_$(4)) -DOBJECT=$(4) \ -Wno-error -MM $(1) -MG -MP | \ sed 's/\.o\s*:/_DEPS =/' >> $(2) @@ -454,6 +437,7 @@ define obj_template '\n$(2) : $$($(4)_DEPS)\n' \ '\nTAGS : $$($(4)_DEPS)\n' \ >> $(2) + @$(PARSEROM) $(1) >> $(2) endef