Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b154bb7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 6adfd34e ab919c06

Makefile

+2 −6
Original line number Diff line number Diff line
@@ -346,7 +346,8 @@ AFLAGS_KERNEL = 
# Use LINUXINCLUDE when you must reference the include/ directory.

# Needed to be compatible with the O= option

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)
@@ -1249,11 +1250,6 @@ tags: FORCE 
# 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:

	find * $(RCS_FIND_IGNORE) \

		-name '*.[hcS]' -type f -print | sort \

include/linux/config.h

+3 −1
Original line number Diff line number Diff line 
#ifndef _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>



#endif

scripts/kconfig/Makefile

+10 −5
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ endif 
HOSTCFLAGS_lex.zconf.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



HOSTLOADLIBES_gconf	= `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs`
@@ -163,11 +163,16 @@ $(obj)/.tmp_qtcheck: 
	  false; \

	fi; \

	LIBPATH=$$DIR/lib; LIB=qt; \

	if [ -f $$QTLIB/libqt-mt.so ] ; then \

		LIB=qt-mt; \

		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 "QTLIB=$$LIB" >> $@; \

	echo "LIBS_QT=$$LIB" >> $@; \

	if [ ! -x $$DIR/bin/moc -a -x /usr/bin/moc ]; then \

	  echo "*"; \

	  echo "* Unable to find $$DIR/bin/moc, using /usr/bin/moc instead."; \