summaryrefslogtreecommitdiffstats
path: root/scripts/kconfig/Makefile
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2005-11-08 21:34:50 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:55:53 -0800
commit491d711035dc08071ed58cf470f15efadb67cb1c (patch)
tree0da933a45aae6810afcbbba38b4f35046477416c /scripts/kconfig/Makefile
parent4cf3cbe2a9682242cd38897914b1f2a95f1db7e4 (diff)
downloadlinux-491d711035dc08071ed58cf470f15efadb67cb1c.tar.gz
linux-491d711035dc08071ed58cf470f15efadb67cb1c.tar.bz2
linux-491d711035dc08071ed58cf470f15efadb67cb1c.zip
[PATCH] kconfig: update kconfig Makefile
Remove the long obsolete zconf.tab.h and fix kconfig make rules to generate the correct output files. Setting LKC_GENPARSER will now also update the shipped files. Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Cc: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'scripts/kconfig/Makefile')
-rw-r--r--scripts/kconfig/Makefile18
1 files changed, 7 insertions, 11 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index c65c435c4923..65e3e7371251 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -114,7 +114,7 @@ gconf-objs := gconf.o kconfig_load.o zconf.tab.o
endif
clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \
- .tmp_gtkcheck zconf.tab.c zconf.tab.h lex.zconf.c
+ .tmp_gtkcheck zconf.tab.c lex.zconf.c
# Needed for systems without gettext
KBUILD_HAVE_NLS := $(shell \
@@ -136,12 +136,6 @@ 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` \
-D LKC_DIRECT_LINK
-$(obj)/conf.o $(obj)/mconf.o $(obj)/qconf.o $(obj)/gconf.o $(obj)/kxgettext: $(obj)/zconf.tab.h
-
-$(obj)/zconf.tab.h: $(src)/zconf.tab.h_shipped
-$(obj)/zconf.tab.c: $(src)/zconf.tab.c_shipped
-$(obj)/lex.zconf.c: $(src)/lex.zconf.c_shipped
-
$(obj)/qconf.o: $(obj)/.tmp_qtcheck
ifeq ($(qconf-target),1)
@@ -230,13 +224,15 @@ $(obj)/lkc_defs.h: $(src)/lkc_proto.h
ifdef LKC_GENPARSER
-$(obj)/zconf.tab.c: $(obj)/zconf.y
-$(obj)/zconf.tab.h: $(obj)/zconf.tab.c
+$(obj)/zconf.tab.c: $(src)/zconf.y
+$(obj)/lex.zconf.c: $(src)/zconf.l
%.tab.c: %.y
- bison -t -d -v -b $* -p $(notdir $*) $<
+ bison -l -b $* -p $(notdir $*) $<
+ cp $@ $@_shipped
lex.%.c: %.l
- flex -P$(notdir $*) -o$@ $<
+ flex -L -P$(notdir $*) -o$@ $<
+ cp $@ $@_shipped
endif