Author: jcrouse
Date: 2008-10-22 17:49:20 +0200 (Wed, 22 Oct 2008)
New Revision: 3686
Modified:
trunk/payloads/libpayload/Makefile
Log:
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 <[EMAIL PROTECTED]>
Acked-by: Jordan Crouse <[EMAIL PROTECTED]>
Modified: trunk/payloads/libpayload/Makefile
===================================================================
--- trunk/payloads/libpayload/Makefile 2008-10-22 11:23:32 UTC (rev 3685)
+++ trunk/payloads/libpayload/Makefile 2008-10-22 15:49:20 UTC (rev 3686)
@@ -115,16 +115,6 @@
$(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 @@
$(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
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
