Re: 2.6.10-rc1-mm3: (fix for make xconfig)

Sam Ravnborg
2004-11-08T22:34:43Z

On Fri, Nov 05, 2004 at 09:26:01PM +0100, Sam Ravnborg wrote:

> Wrong fix.
> I will look into it later tonight.

Here is the fix. Tested with both xconfg and gconfig.

Sam

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/11/06 21:18:02+01:00 sam@mars.ravnborg.org
# 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 <sam@ravnborg.org>
#
# scripts/kconfig/Makefile
# 2004/11/06 21:17:26+01:00 sam@mars.ravnborg.org +5 -4
# Enable build of qconf anf gconf without loadable module support
#
diff -Nru a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
--- a/scripts/kconfig/Makefile 2004-11-08 23:33:26 +01:00
+++ b/scripts/kconfig/Makefile 2004-11-08 23:33:26 +01:00
@@ -84,11 +84,11 @@

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_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