diff options
| author | Sam Ravnborg <sam@mars.ravnborg.org> | 2004-11-06 23:18:02 +0100 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2004-11-06 23:18:02 +0100 |
| commit | 395796acff64672d4935cc47ef93fd153b3abab0 (patch) | |
| tree | 0d8c73d9ff392033e45b41c3af6e22223ae77a65 /scripts | |
| parent | 0588ba6c6555164ccd0b3214685b5be4ef7597b9 (diff) | |
| download | history-395796acff64672d4935cc47ef93fd153b3abab0.tar.gz | |
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>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index b26d545124e4af..51492ba6fbcd2e 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 |