From 51e142fef4c47b6ba30b9aaf5f3fcf34c781b59a Mon Sep 17 00:00:00 2001
From: Patrick Georgi <patrick.georgi@coresystems.de>
Date: Sat, 27 Mar 2010 17:18:39 +0000
Subject: make only needs to read Makefile.incs once, thanks to the
 SECONDEXPANSION feature of GNU make (and we rely on GNU make for lots of
 things already)

File paths are relative to the root directory, which simplifies
debugging (make V=1 gives shorter command lines) and helps ccache
finding matches for checkouts in different directories (even though it
should normalize paths itself)

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5304 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 src/arch/i386/Makefile.inc | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'src/arch/i386/Makefile.inc')

diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc
index 02fafba086..575dab902b 100644
--- a/src/arch/i386/Makefile.inc
+++ b/src/arch/i386/Makefile.inc
@@ -7,8 +7,6 @@ subdirs-y += smp
 
 obj-$(CONFIG_HAVE_OPTION_TABLE) += ../../option_table.o
 
-ifdef POST_EVALUATION
-
 #######################################################################
 # Build the final rom image
 COREBOOT_ROM_DEPENDENCIES:=
@@ -73,14 +71,14 @@ $(obj)/coreboot_ram: $(obj)/coreboot_ram.o $(src)/arch/i386/coreboot_ram.ld #ldo
 	$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/arch/i386/coreboot_ram.ld $(obj)/coreboot_ram.o
 	$(NM) -n $(obj)/coreboot_ram | sort > $(obj)/coreboot_ram.map
 
-$(obj)/coreboot_ram.o: $(obj)/arch/i386/lib/c_start.o $(drivers) $(obj)/coreboot.a $(LIBGCC_FILE_NAME)
+$(obj)/coreboot_ram.o: $(obj)/arch/i386/lib/c_start.o $$(drivers) $(obj)/coreboot.a $(LIBGCC_FILE_NAME)
 	@printf "    CC         $(subst $(obj)/,,$(@))\n"
 	$(CC) -nostdlib -r -o $@ $(obj)/arch/i386/lib/c_start.o $(drivers) -Wl,--start-group $(obj)/coreboot.a $(LIBGCC_FILE_NAME) -Wl,--end-group
 
-$(obj)/coreboot.a: $(objs)
+$(obj)/coreboot.a: $$(objs)
 	@printf "    AR         $(subst $(obj)/,,$(@))\n"
 	rm -f $(obj)/coreboot.a
-	$(AR) cr $(obj)/coreboot.a $(objs)
+	$(AR) cr $(obj)/coreboot.a $^
 
 #######################################################################
 # done
@@ -195,7 +193,7 @@ ROMCCFLAGS ?= -mcpu=p2 -O2
 
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/romcc $(OPTION_TABLE_H) $(obj)/build.h
 	printf "    ROMCC      romstage.inc\n"
-	$(ROMCC) -c -S $(ROMCCFLAGS) -include $(obj)/build.h -I. $(INCLUDES) $< -o $@
+	$(ROMCC) -c -S $(ROMCCFLAGS) -I. $(INCLUDES) $< -o $@
 
 else
 
@@ -205,7 +203,7 @@ $(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)
 
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h
 	printf "    CC         romstage.inc\n"
-	$(CC) -MMD $(CFLAGS) -include $(obj)/build.h -I$(src) -I. -c -S $< -o $@
+	$(CC) -MMD $(CFLAGS) -I$(src) -I. -c -S $< -o $@
 
 $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc
 	printf "    POST       romstage.inc\n"
@@ -213,9 +211,6 @@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(obj)/mainboard/$(MAINBOARDDIR)/
 	mv $@.tmp $@
 endif
 
-else
-# Only in first pass
-
 # Things that appear in every board
 initobjs += $(obj)/mainboard/$(MAINBOARDDIR)/crt0.o
 objs += $(obj)/mainboard/$(MAINBOARDDIR)/mainboard.o
@@ -249,8 +244,6 @@ ifeq ($(CONFIG_HAVE_BUS_CONFIG),y)
 objs += $(obj)/mainboard/$(MAINBOARDDIR)/get_bus_conf.o
 endif
 
-endif
-
 ifeq ($(CONFIG_TINY_BOOTBLOCK),y)
 include $(src)/arch/i386/Makefile.bootblock.inc
 else
-- 
cgit v1.2.3