tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild

Linus Torvalds 0b154bb7 6adfd34e

+15 -12
+2 -6
Makefile
··· 346 346 # Use LINUXINCLUDE when you must reference the include/ directory. 347 347 # Needed to be compatible with the O= option 348 348 LINUXINCLUDE := -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 351 352 CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE) 352 353 ··· 1249 1248 1250 1249 # Scripts to check various things for consistency 1251 1250 # --------------------------------------------------------------------------- 1252 - 1253 - configcheck: 1254 - find * $(RCS_FIND_IGNORE) \ 1255 - -name '*.[hcS]' -type f -print | sort \ 1256 - | xargs $(PERL) -w scripts/checkconfig.pl 1257 1251 1258 1252 includecheck: 1259 1253 find * $(RCS_FIND_IGNORE) \
+3 -1
include/linux/config.h
··· 1 1 #ifndef _LINUX_CONFIG_H 2 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 6 #include <linux/autoconf.h> 5 7 6 8 #endif
+10 -5
scripts/kconfig/Makefile
··· 129 129 HOSTCFLAGS_lex.zconf.o := -I$(src) 130 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 133 HOSTCXXFLAGS_qconf.o = -I$(QTDIR)/include -D LKC_DIRECT_LINK 134 134 135 135 HOSTLOADLIBES_gconf = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs` ··· 163 163 false; \ 164 164 fi; \ 165 165 LIBPATH=$$DIR/lib; LIB=qt; \ 166 - $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \ 167 - LIBPATH=$$DIR/lib/$$($(HOSTCXX) -print-multi-os-directory); \ 168 - if [ -f $$LIBPATH/libqt-mt.so ]; then LIB=qt-mt; fi; \ 166 + if [ -f $$QTLIB/libqt-mt.so ] ; then \ 167 + LIB=qt-mt; \ 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 174 echo "QTDIR=$$DIR" > $@; echo "QTLIBPATH=$$LIBPATH" >> $@; \ 170 - echo "QTLIB=$$LIB" >> $@; \ 175 + echo "LIBS_QT=$$LIB" >> $@; \ 171 176 if [ ! -x $$DIR/bin/moc -a -x /usr/bin/moc ]; then \ 172 177 echo "*"; \ 173 178 echo "* Unable to find $$DIR/bin/moc, using /usr/bin/moc instead."; \