forked from Minki/linux
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
This commit is contained in:
commit
0b154bb7d0
8
Makefile
8
Makefile
|
@ -346,7 +346,8 @@ AFLAGS_KERNEL =
|
||||||
# Use LINUXINCLUDE when you must reference the include/ directory.
|
# Use LINUXINCLUDE when you must reference the include/ directory.
|
||||||
# Needed to be compatible with the O= option
|
# Needed to be compatible with the O= option
|
||||||
LINUXINCLUDE := -Iinclude \
|
LINUXINCLUDE := -Iinclude \
|
||||||
$(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include)
|
$(if $(KBUILD_SRC),-Iinclude2 -I$(srctree)/include) \
|
||||||
|
-imacros include/linux/autoconf.h
|
||||||
|
|
||||||
CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE)
|
CPPFLAGS := -D__KERNEL__ $(LINUXINCLUDE)
|
||||||
|
|
||||||
|
@ -1249,11 +1250,6 @@ tags: FORCE
|
||||||
# Scripts to check various things for consistency
|
# Scripts to check various things for consistency
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
configcheck:
|
|
||||||
find * $(RCS_FIND_IGNORE) \
|
|
||||||
-name '*.[hcS]' -type f -print | sort \
|
|
||||||
| xargs $(PERL) -w scripts/checkconfig.pl
|
|
||||||
|
|
||||||
includecheck:
|
includecheck:
|
||||||
find * $(RCS_FIND_IGNORE) \
|
find * $(RCS_FIND_IGNORE) \
|
||||||
-name '*.[hcS]' -type f -print | sort \
|
-name '*.[hcS]' -type f -print | sort \
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
#ifndef _LINUX_CONFIG_H
|
#ifndef _LINUX_CONFIG_H
|
||||||
#define _LINUX_CONFIG_H
|
#define _LINUX_CONFIG_H
|
||||||
|
/* This file is no longer in use and kept only for backward compatibility.
|
||||||
|
* autoconf.h is now included via -imacros on the commandline
|
||||||
|
*/
|
||||||
#include <linux/autoconf.h>
|
#include <linux/autoconf.h>
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -129,7 +129,7 @@ endif
|
||||||
HOSTCFLAGS_lex.zconf.o := -I$(src)
|
HOSTCFLAGS_lex.zconf.o := -I$(src)
|
||||||
HOSTCFLAGS_zconf.tab.o := -I$(src)
|
HOSTCFLAGS_zconf.tab.o := -I$(src)
|
||||||
|
|
||||||
HOSTLOADLIBES_qconf = -L$(QTLIBPATH) -Wl,-rpath,$(QTLIBPATH) -l$(QTLIB) -ldl
|
HOSTLOADLIBES_qconf = -L$(QTLIBPATH) -Wl,-rpath,$(QTLIBPATH) -l$(LIBS_QT) -ldl
|
||||||
HOSTCXXFLAGS_qconf.o = -I$(QTDIR)/include -D LKC_DIRECT_LINK
|
HOSTCXXFLAGS_qconf.o = -I$(QTDIR)/include -D LKC_DIRECT_LINK
|
||||||
|
|
||||||
HOSTLOADLIBES_gconf = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs`
|
HOSTLOADLIBES_gconf = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs`
|
||||||
|
@ -163,11 +163,16 @@ $(obj)/.tmp_qtcheck:
|
||||||
false; \
|
false; \
|
||||||
fi; \
|
fi; \
|
||||||
LIBPATH=$$DIR/lib; LIB=qt; \
|
LIBPATH=$$DIR/lib; LIB=qt; \
|
||||||
$(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
|
if [ -f $$QTLIB/libqt-mt.so ] ; then \
|
||||||
LIBPATH=$$DIR/lib/$$($(HOSTCXX) -print-multi-os-directory); \
|
LIB=qt-mt; \
|
||||||
if [ -f $$LIBPATH/libqt-mt.so ]; then LIB=qt-mt; fi; \
|
LIBPATH=$$QTLIB; \
|
||||||
|
else \
|
||||||
|
$(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
|
||||||
|
LIBPATH=$$DIR/lib/$$($(HOSTCXX) -print-multi-os-directory); \
|
||||||
|
if [ -f $$LIBPATH/libqt-mt.so ]; then LIB=qt-mt; fi; \
|
||||||
|
fi; \
|
||||||
echo "QTDIR=$$DIR" > $@; echo "QTLIBPATH=$$LIBPATH" >> $@; \
|
echo "QTDIR=$$DIR" > $@; echo "QTLIBPATH=$$LIBPATH" >> $@; \
|
||||||
echo "QTLIB=$$LIB" >> $@; \
|
echo "LIBS_QT=$$LIB" >> $@; \
|
||||||
if [ ! -x $$DIR/bin/moc -a -x /usr/bin/moc ]; then \
|
if [ ! -x $$DIR/bin/moc -a -x /usr/bin/moc ]; then \
|
||||||
echo "*"; \
|
echo "*"; \
|
||||||
echo "* Unable to find $$DIR/bin/moc, using /usr/bin/moc instead."; \
|
echo "* Unable to find $$DIR/bin/moc, using /usr/bin/moc instead."; \
|
||||||
|
|
Loading…
Reference in New Issue
Block a user