From 57205c7e43e1ec3d4d62ea86e33c7acb7dbad81d Mon Sep 17 00:00:00 2001
From: Patrick Georgi <patrick.georgi@secunet.com>
Date: Tue, 8 Mar 2011 20:49:18 +0000
Subject: [PATCH] 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 <patrick.georgi@secunet.com>
Acked-by: Jonathan Kollasch <jakllsch@kollasch.net>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6438 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 Makefile              | 5 +++--
 Makefile.inc          | 5 ++++-
 src/pc80/Makefile.inc | 3 ---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 4c787ef174..06847b61a0 100644
--- a/Makefile
+++ b/Makefile
@@ -207,9 +207,10 @@ define create_cc_template
 # $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 @@ endef
 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))))
diff --git a/Makefile.inc b/Makefile.inc
index 1d2d0dcf90..b87cec7d71 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -54,6 +54,9 @@ romstage-c-ccopts:=-D__PRE_RAM__
 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 @@ $(objutil)/%.o: $(objutil)/%.c
 	@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 $@ $<
 
diff --git a/src/pc80/Makefile.inc b/src/pc80/Makefile.inc
index b82ea41336..0bc57b2ced 100644
--- a/src/pc80/Makefile.inc
+++ b/src/pc80/Makefile.inc
@@ -7,9 +7,6 @@ ramstage-y += keyboard.c
 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