From 395796acff64672d4935cc47ef93fd153b3abab0 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Sat, 6 Nov 2004 23:18:02 +0100 Subject: kconfig: fix xconfig and gconfig Patch that disabled use of loadable modules broke qconf and gconf. Fixed by disabling this also for these targets. Signed-off-by: Sam Ravnborg --- scripts/kconfig/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index b26d545124e4..51492ba6fbcd 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -84,11 +84,11 @@ endif ifeq ($(qconf-target),1) qconf-cxxobjs := qconf.o -qconf-objs := kconfig_load.o +qconf-objs := kconfig_load.o zconf.tab.o endif ifeq ($(gconf-target),1) -gconf-objs := gconf.o kconfig_load.o +gconf-objs := gconf.o kconfig_load.o zconf.tab.o endif clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \ @@ -99,10 +99,11 @@ HOSTCFLAGS_lex.zconf.o := -I$(src) HOSTCFLAGS_zconf.tab.o := -I$(src) HOSTLOADLIBES_qconf = -L$(QTLIBPATH) -Wl,-rpath,$(QTLIBPATH) -l$(QTLIB) -ldl -HOSTCXXFLAGS_qconf.o = -I$(QTDIR)/include +HOSTCXXFLAGS_qconf.o = -I$(QTDIR)/include -D LKC_DIRECT_LINK HOSTLOADLIBES_gconf = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs` -HOSTCFLAGS_gconf.o = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --cflags` +HOSTCFLAGS_gconf.o = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --cflags` \ + -D LKC_DIRECT_LINK $(obj)/conf.o $(obj)/mconf.o $(obj)/qconf.o $(obj)/gconf.o: $(obj)/zconf.tab.h -- cgit v1.2.3