From e38d0a6743aab8bde432e97c48c147fea5b30363 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 1 Mar 2011 08:09:22 +0000 Subject: [PATCH] Fix double inclusion of toplevel Makefile.inc Signed-off-by: Patrick Georgi Acked-by: Patrick Georgi git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6419 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 05b54e298..4c787ef17 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,9 @@ export objk := $(objutil)/kconfig 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 @@ DOXYGEN_OUTPUT_DIR := doxygen 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 endif ifeq ($(NOCOMPILE),1) +include $(TOPLEVEL)/Makefile.inc real-all: config else @@ -189,7 +192,7 @@ evaluate_subdirs= \ $(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)))) -- 2.25.1