diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2008-10-22 15:49:20 +0000 |
|---|---|---|
| committer | Jordan Crouse <jordan.crouse@amd.com> | 2008-10-22 15:49:20 +0000 |
| commit | ea8724578e096e5d39fc49b17d63d2af0f76e537 (patch) | |
| tree | a16bfc6da4c9edd76bdf18227e145525f53a4162 /payloads | |
| parent | ac431505c6c7914cbea4923c9c80eb83d72e34fb (diff) | |
| download | coreboot-ea8724578e096e5d39fc49b17d63d2af0f76e537.tar.gz coreboot-ea8724578e096e5d39fc49b17d63d2af0f76e537.tar.bz2 coreboot-ea8724578e096e5d39fc49b17d63d2af0f76e537.zip | |
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 <uwe@hermann-uwe.de>
Acked-by: Jordan Crouse <jordan.crouse@amd.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3686 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'payloads')
| -rw-r--r-- | payloads/libpayload/Makefile | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index a426d847c17c..4fcf72b54583 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 |