diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-11-07 12:05:22 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-11-07 12:05:22 -0500 |
| commit | 0ad3a96f8ad910ecf87a25ec69ed360b284dee2e (patch) | |
| tree | 12d292fd58fc0f7a3eb56c89dfc23569f3ab6c00 /scripts | |
| parent | f79b348856fbaf77e4a0c5cb08a808e5879967a9 (diff) | |
| parent | 5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (diff) | |
Auto-update from upstream
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/Makefile | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 0dd96919de3e..c65c435c4923 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile | |||
| @@ -118,7 +118,7 @@ clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \ | |||
| 118 | 118 | ||
| 119 | # Needed for systems without gettext | 119 | # Needed for systems without gettext |
| 120 | KBUILD_HAVE_NLS := $(shell \ | 120 | KBUILD_HAVE_NLS := $(shell \ |
| 121 | if echo "\#include <libint.h>" | $(HOSTCC) $(HOSTCFLAGS) -E - > /dev/null 2>&1 ; \ | 121 | if echo "\#include <libintl.h>" | $(HOSTCC) $(HOSTCFLAGS) -E - > /dev/null 2>&1 ; \ |
| 122 | then echo yes ; \ | 122 | then echo yes ; \ |
| 123 | else echo no ; fi) | 123 | else echo no ; fi) |
| 124 | ifeq ($(KBUILD_HAVE_NLS),no) | 124 | ifeq ($(KBUILD_HAVE_NLS),no) |
| @@ -129,7 +129,7 @@ endif | |||
| 129 | HOSTCFLAGS_lex.zconf.o := -I$(src) | 129 | HOSTCFLAGS_lex.zconf.o := -I$(src) |
| 130 | HOSTCFLAGS_zconf.tab.o := -I$(src) | 130 | HOSTCFLAGS_zconf.tab.o := -I$(src) |
| 131 | 131 | ||
| 132 | HOSTLOADLIBES_qconf = -L$(QTLIBPATH) -Wl,-rpath,$(QTLIBPATH) -l$(QTLIB) -ldl | 132 | HOSTLOADLIBES_qconf = -L$(QTLIBPATH) -Wl,-rpath,$(QTLIBPATH) -l$(LIBS_QT) -ldl |
| 133 | HOSTCXXFLAGS_qconf.o = -I$(QTDIR)/include -D LKC_DIRECT_LINK | 133 | HOSTCXXFLAGS_qconf.o = -I$(QTDIR)/include -D LKC_DIRECT_LINK |
| 134 | 134 | ||
| 135 | HOSTLOADLIBES_gconf = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs` | 135 | HOSTLOADLIBES_gconf = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs` |
| @@ -163,11 +163,16 @@ $(obj)/.tmp_qtcheck: | |||
| 163 | false; \ | 163 | false; \ |
| 164 | fi; \ | 164 | fi; \ |
| 165 | LIBPATH=$$DIR/lib; LIB=qt; \ | 165 | LIBPATH=$$DIR/lib; LIB=qt; \ |
| 166 | $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \ | 166 | if [ -f $$QTLIB/libqt-mt.so ] ; then \ |
| 167 | LIBPATH=$$DIR/lib/$$($(HOSTCXX) -print-multi-os-directory); \ | 167 | LIB=qt-mt; \ |
| 168 | if [ -f $$LIBPATH/libqt-mt.so ]; then LIB=qt-mt; fi; \ | 168 | LIBPATH=$$QTLIB; \ |
| 169 | else \ | ||
| 170 | $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \ | ||
| 171 | LIBPATH=$$DIR/lib/$$($(HOSTCXX) -print-multi-os-directory); \ | ||
| 172 | if [ -f $$LIBPATH/libqt-mt.so ]; then LIB=qt-mt; fi; \ | ||
| 173 | fi; \ | ||
| 169 | echo "QTDIR=$$DIR" > $@; echo "QTLIBPATH=$$LIBPATH" >> $@; \ | 174 | echo "QTDIR=$$DIR" > $@; echo "QTLIBPATH=$$LIBPATH" >> $@; \ |
| 170 | echo "QTLIB=$$LIB" >> $@; \ | 175 | echo "LIBS_QT=$$LIB" >> $@; \ |
| 171 | if [ ! -x $$DIR/bin/moc -a -x /usr/bin/moc ]; then \ | 176 | if [ ! -x $$DIR/bin/moc -a -x /usr/bin/moc ]; then \ |
| 172 | echo "*"; \ | 177 | echo "*"; \ |
| 173 | echo "* Unable to find $$DIR/bin/moc, using /usr/bin/moc instead."; \ | 178 | echo "* Unable to find $$DIR/bin/moc, using /usr/bin/moc instead."; \ |