From ea8724578e096e5d39fc49b17d63d2af0f76e537 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 22 Oct 2008 15:49:20 +0000 Subject: Fix ordering problem in the libpayload Makefile. The include of 'include util/kconfig/Makefile' must come before certain pattern rules for compilation of kconfig files, otherwise the build would break in most situations. Signed-off-by: Uwe Hermann Acked-by: Jordan Crouse git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3686 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- payloads/libpayload/Makefile | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'payloads/libpayload') diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index a426d847c1..4fcf72b545 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -115,16 +115,6 @@ $(obj)/lib/libpayload.a: $(OBJS) $(Q)printf " AR $(subst $(shell pwd)/,,$(@))\n" $(Q)$(AR) rc $@ $(OBJS) -include util/kconfig/Makefile - -$(obj)/%.o: $(src)/%.c - $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $< - -$(obj)/%.S.o: $(src)/%.S - $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $< - endif install: lib @@ -169,6 +159,22 @@ distclean: clean $(Q)rm -rf build $(Q)rm -f .config .config.old ..config.tmp .kconfig.d .tmpconfig* +# This include must come _before_ the pattern rules below! +# Order _does_ matter for pattern rules. +include util/kconfig/Makefile + +ifeq ($(strip $(HAVE_DOTCONFIG)),) +else + +$(obj)/%.o: $(src)/%.c + $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" + $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $< + +$(obj)/%.S.o: $(src)/%.S + $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" + $(Q)$(CC) -m32 $(CFLAGS) -c -o $@ $< + +endif .PHONY: $(PHONY) prepare clean distclean doxygen doxy -- cgit v1.2.3