r690 - in coreboot-v3/util/kconfig: . lxdialog

Author: oxygene
Date: 2008-06-06 22:47:42 +0200 (Fri, 06 Jun 2008)
New Revision: 690

Modified:
   coreboot-v3/util/kconfig/Makefile
   coreboot-v3/util/kconfig/lxdialog/Makefile
Log:
Order libraries last on the command line when
building kconfig and lxdialog, so that their
content is used to resolve unknown symbols even
when they are static libraries.

Also fix HOST_LOADLIBS typo.

Signed-Off-By: Patrick Georgi 
Acked-by: Peter Stuge

Modified: coreboot-v3/util/kconfig/Makefile
===================================================================
--- coreboot-v3/util/kconfig/Makefile	2008-06-04 14:36:35 UTC (rev 689)
+++ coreboot-v3/util/kconfig/Makefile	2008-06-06 20:47:42 UTC (rev 690)
@@ -102,11 +102,11 @@

$(obj)/util/kconfig/mconf: $(patsubst %,$(obj)/util/kconfig/%,$(mconf-objects))
    $(Q)printf "  HOSTCC  $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)$(HOSTCC) $(CURSESLIBS) $(INTLLIBS) -o $@ $^
+	$(Q)$(HOSTCC) -o $@ $^ $(CURSESLIBS) $(INTLLIBS)

$(obj)/util/kconfig/conf: $(patsubst %,$(obj)/util/kconfig/%,$(conf-objects))
    $(Q)printf "  HOSTCC  $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)$(HOSTCC) $(CURSESLIBS) -o $@ $^
+	$(Q)$(HOSTCC) -o $@ $^ $(CURSESLIBS)

$(obj)/util/kconfig/qconf: $(patsubst %,$(obj)/util/kconfig/%,$(qconf-objects))
    $(Q)printf "  HOSTCXX $(subst $(shell pwd)/,,$(@))\n"

Modified: coreboot-v3/util/kconfig/lxdialog/Makefile
===================================================================
--- coreboot-v3/util/kconfig/lxdialog/Makefile	2008-06-04 14:36:35 UTC (rev 689)
+++ coreboot-v3/util/kconfig/lxdialog/Makefile	2008-06-06 20:47:42 UTC (rev 690)
@@ -8,14 +8,14 @@
 # Use recursively expanded variables so we do not call gcc unless
 # we really need to do so. (Do not call gcc as part of make mrproper)
 HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
-HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
+HOST_LOADLIBS   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))

HOST_EXTRACFLAGS += -DLOCALE

.PHONY: dochecklxdialog
 $(obj)/dochecklxdialog:
    $(Q)printf "  CHECK   $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_LOADLIBES)
+	$(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_LOADLIBS)

always		:= lxdialog dochecklxdialog

@@ -24,8 +24,8 @@

$(obj)/util/kconfig/lxdialog/lxdialog: $(obj)/dochecklxdialog $(patsubst %,$(obj)/util/kconfig/lxdialog/%,$(lxdialog-objs))
    $(Q)printf "  HOSTCC  $(subst $(shell pwd)/,,$(@))\n"
-	$(Q)$(HOSTCC) $(HOST_LOADLIBES) \
-		$(patsubst %,$(obj)/util/kconfig/lxdialog/%,$(lxdialog-objs)) -o $@
+	$(Q)$(HOSTCC) \
+		$(patsubst %,$(obj)/util/kconfig/lxdialog/%,$(lxdialog-objs)) -o $@ $(HOST_LOADLIBS)

$(obj)/util/kconfig/lxdialog/%.o: $(src)/util/kconfig/lxdialog/%.c
    $(Q)mkdir -p $(obj)/util/kconfig/lxdialog/