[commit] r6419 - trunk

[repository service]

Author: oxygene
Date: Tue Mar  1 09:09:22 2011
New Revision: 6419
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6419

Log:
Fix double inclusion of toplevel Makefile.inc

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

Modified:
   trunk/Makefile

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Tue Mar  1 08:30:14 2011	(r6418)
+++ trunk/Makefile	Tue Mar  1 09:09:22 2011	(r6419)
@@ -44,6 +44,9 @@
 export KCONFIG_AUTOHEADER := $(obj)/config.h
 export KCONFIG_AUTOCONFIG := $(obj)/auto.conf

+# directory containing the toplevel Makefile.inc
+TOPLEVEL := .
+
 CONFIG_SHELL := sh
 KBUILD_DEFCONFIG := configs/defconfig
 UNAME_RELEASE := $(shell uname -r)
@@ -73,9 +76,8 @@

all: real-all

-# This include must come _before_ he pattern rules below!
+# This include must come _before_ the pattern rules below!
 # Order _does_ matter for pattern rules.
-include Makefile.inc
 include util/kconfig/Makefile

# Three cases where we don't need fully populated $(obj) lists:
@@ -93,6 +95,7 @@
 endif

ifeq ($(NOCOMPILE),1)
+include $(TOPLEVEL)/Makefile.inc
 real-all: config

else
@@ -189,7 +192,7 @@
    $(if $(subdirs),$(eval $(call evaluate_subdirs)))

# collect all object files eligible for building
-subdirs:=.
+subdirs:=$(TOPLEVEL)
 $(eval $(call evaluate_subdirs))

src-to-obj=$(addsuffix .$(1).o, $(basename $(patsubst src/%, $(obj)/%, $($(1)-srcs))))