aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--include/linux/config.h4
-rw-r--r--scripts/kconfig/Makefile15
3 files changed, 15 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 79601320ac3e..2dac8010c142 100644
--- a/Makefile
+++ b/Makefile
@@ -346,7 +346,8 @@ AFLAGS_KERNEL =
346# Use LINUXINCLUDE when you must reference the include/ directory. 346# Use LINUXINCLUDE when you must reference the include/ directory.
347# Needed to be compatible with the O= option 347# Needed to be compatible with the O= option
348LINUXINCLUDE := -Iinclude \ 348LINUXINCLUDE := -Iinclude \
349 $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) 349 $(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
350 -imacros include/linux/autoconf.h
350 351
351CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE) 352CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE)
352 353
@@ -1249,11 +1250,6 @@ tags: FORCE
1249# Scripts to check various things for consistency 1250# Scripts to check various things for consistency
1250# --------------------------------------------------------------------------- 1251# ---------------------------------------------------------------------------
1251 1252
1252configcheck:
1253 find * $(RCS_FIND_IGNORE) \
1254 -name '*.[hcS]' -type f -print | sort \
1255 | xargs $(PERL) -w scripts/checkconfig.pl
1256
1257includecheck: 1253includecheck:
1258 find * $(RCS_FIND_IGNORE) \ 1254 find * $(RCS_FIND_IGNORE) \
1259 -name '*.[hcS]' -type f -print | sort \ 1255 -name '*.[hcS]' -type f -print | sort \
diff --git a/include/linux/config.h b/include/linux/config.h
index 9d1c14f7ad6d..a91f5e55b525 100644
--- a/include/linux/config.h
+++ b/include/linux/config.h
@@ -1,6 +1,8 @@
1#ifndef _LINUX_CONFIG_H 1#ifndef _LINUX_CONFIG_H
2#define _LINUX_CONFIG_H 2#define _LINUX_CONFIG_H
3 3/* This file is no longer in use and kept only for backward compatibility.
4 * autoconf.h is now included via -imacros on the commandline
5 */
4#include <linux/autoconf.h> 6#include <linux/autoconf.h>
5 7
6#endif 8#endif
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 0dd96919de3e..455aeabd95dd 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -129,7 +129,7 @@ endif
129HOSTCFLAGS_lex.zconf.o := -I$(src) 129HOSTCFLAGS_lex.zconf.o := -I$(src)
130HOSTCFLAGS_zconf.tab.o := -I$(src) 130HOSTCFLAGS_zconf.tab.o := -I$(src)
131 131
132HOSTLOADLIBES_qconf = -L$(QTLIBPATH) -Wl,-rpath,$(QTLIBPATH) -l$(QTLIB) -ldl 132HOSTLOADLIBES_qconf = -L$(QTLIBPATH) -Wl,-rpath,$(QTLIBPATH) -l$(LIBS_QT) -ldl
133HOSTCXXFLAGS_qconf.o = -I$(QTDIR)/include -D LKC_DIRECT_LINK 133HOSTCXXFLAGS_qconf.o = -I$(QTDIR)/include -D LKC_DIRECT_LINK
134 134
135HOSTLOADLIBES_gconf = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs` 135HOSTLOADLIBES_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."; \