Commit 395796ac authored by Sam Ravnborg's avatar Sam Ravnborg

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: default avatarSam Ravnborg <sam@ravnborg.org>
parent 0588ba6c
...@@ -84,11 +84,11 @@ endif ...@@ -84,11 +84,11 @@ endif
ifeq ($(qconf-target),1) ifeq ($(qconf-target),1)
qconf-cxxobjs := qconf.o qconf-cxxobjs := qconf.o
qconf-objs := kconfig_load.o qconf-objs := kconfig_load.o zconf.tab.o
endif endif
ifeq ($(gconf-target),1) ifeq ($(gconf-target),1)
gconf-objs := gconf.o kconfig_load.o gconf-objs := gconf.o kconfig_load.o zconf.tab.o
endif endif
clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \ clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \
...@@ -99,10 +99,11 @@ HOSTCFLAGS_lex.zconf.o := -I$(src) ...@@ -99,10 +99,11 @@ 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$(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` 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 $(obj)/conf.o $(obj)/mconf.o $(obj)/qconf.o $(obj)/gconf.o: $(obj)/zconf.tab.h
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment