[commit] r6438 - in trunk: . src/pc80

[repository service]

Author: oxygene
Date: Tue Mar  8 21:49:18 2011
New Revision: 6438
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6438

Log:
Add option_table.h as dependency for all C based object files if option tables are used.

This is to make sure that the file exists when it is needed. While this isn't the case for every C source file, it doesn't hurt either to create the file a bit sooner than strictly necessary.

Signed-off-by: Patrick Georgi 
Acked-by: Jonathan Kollasch

Modified:
   trunk/Makefile
   trunk/Makefile.inc
   trunk/src/pc80/Makefile.inc

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Tue Mar  8 13:58:16 2011	(r6437)
+++ trunk/Makefile	Tue Mar  8 21:49:18 2011	(r6438)
@@ -207,9 +207,10 @@
 # $1 obj class
 # $2 source suffix (c, S)
 # $3 additional compiler flags
+# $4 additional dependencies
 ifn$(EMPTY)def $(1)-objs_$(2)_template
 de$(EMPTY)fine $(1)-objs_$(2)_template
-$(obj)/$$(1).$(1).o: src/$$(1).$(2) $(obj)/config.h
+$(obj)/$$(1).$(1).o: src/$$(1).$(2) $(obj)/config.h $(4)
    @printf "    CC         $$$$(subst $$$$(obj)/,,$$$$(@))\n"
    $(CC) $(3) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$<
 en$(EMPTY)def
@@ -219,7 +220,7 @@
 filetypes-of-class=$(subst .,,$(sort $(suffix $($(1)-srcs))))
 $(foreach class,$(classes), \
    $(foreach type,$(call filetypes-of-class,$(class)), \
-		$(eval $(call create_cc_template,$(class),$(type),$($(class)-$(type)-ccopts)))))
+		$(eval $(call create_cc_template,$(class),$(type),$($(class)-$(type)-ccopts),$($(class)-$(type)-deps)))))

foreach-src=$(foreach file,$($(1)-srcs),$(eval $(call $(1)-objs_$(subst .,,$(suffix $(file)))_template,$(subst src/,,$(basename $(file))))))
 $(eval $(foreach class,$(classes),$(call foreach-src,$(class))))

Modified: trunk/Makefile.inc
==============================================================================
--- trunk/Makefile.inc	Tue Mar  8 13:58:16 2011	(r6437)
+++ trunk/Makefile.inc	Tue Mar  8 21:49:18 2011	(r6438)
@@ -54,6 +54,9 @@
 romstage-S-ccopts:=-DASSEMBLY -D__PRE_RAM__
 driver-S-ccopts:=-DASSEMBLY

+ramstage-c-deps:=$$(OPTION_TABLE_H)
+romstage-c-deps:=$$(OPTION_TABLE_H)
+
 #######################################################################
 # Add handler to compile ACPI's ASL
 define ramstage-objs_asl_template
@@ -174,7 +177,7 @@
    @printf "    HOSTCC     $(subst $(objutil)/,,$(@))\n"
    $(HOSTCC) -MMD -I$(subst $(objutil)/,util/,$(dir $<)) -I$(dir $<) $(HOSTCFLAGS) -c -o $@ $<

-$(obj)/%.ramstage.o: $(obj)/%.c $(obj)/config.h
+$(obj)/%.ramstage.o: $(obj)/%.c $(obj)/config.h $(OPTION_TABLE_H)
    @printf "    CC         $(subst $(obj)/,,$(@))\n"
    $(CC) -MMD $(CFLAGS) -c -o $@ $<

Modified: trunk/src/pc80/Makefile.inc
==============================================================================
--- trunk/src/pc80/Makefile.inc	Tue Mar  8 13:58:16 2011	(r6437)
+++ trunk/src/pc80/Makefile.inc	Tue Mar  8 21:49:18 2011	(r6438)
@@ -7,9 +7,6 @@
 romstage-$(CONFIG_USE_OPTION_TABLE) += mc146818rtc_early.c
 subdirs-y += vga

-$(obj)/pc80/mc146818rtc.ramstage.o : $(OPTION_TABLE_H)
-$(obj)/pc80/mc146818rtc_early.romstage.o : $(OPTION_TABLE_H)
-
 cbfs-files-$(CONFIG_HAVE_CMOS_DEFAULT) += cmos.default
 cmos.default-file = $(CONFIG_CMOS_DEFAULT_FILE)
 cmos.default-type = 0xaa