1 files changed, 6 insertions, 28 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index faa9a4701b6f..0b4276c047b2 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -204,7 +204,7 @@ ifeq ($(gconf-target),1)
 endif
 
 clean-files     := lkc_defs.h qconf.moc .tmp_qtcheck .tmp_gtkcheck
-clean-files     += zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
+clean-files     += zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h
 clean-files     += mconf qconf gconf nconf
 clean-files     += config.pot linux.pot
 
@@ -220,9 +220,12 @@ always := dochecklxdialog
 HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS))
 
 # generated files seem to need this to find local include files
-HOSTCFLAGS_lex.zconf.o  := -I$(src)
+HOSTCFLAGS_zconf.lex.o  := -I$(src)
 HOSTCFLAGS_zconf.tab.o  := -I$(src)
 
+LEX_PREFIX_zconf        := zconf
+YACC_PREFIX_zconf       := zconf
+
 HOSTLOADLIBES_qconf     = $(KC_QT_LIBS) -ldl
 HOSTCXXFLAGS_qconf.o    = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK
 
@@ -316,7 +319,7 @@ $(obj)/.tmp_gtkcheck:
         fi
 endif
 
-$(obj)/zconf.tab.o: $(obj)/lex.zconf.c $(obj)/zconf.hash.c
+$(obj)/zconf.tab.o: $(obj)/zconf.lex.c $(obj)/zconf.hash.c
 
 $(obj)/kconfig_load.o: $(obj)/lkc_defs.h
 
@@ -335,28 +338,3 @@ $(obj)/gconf.glade.h: $(obj)/gconf.glade
         $(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \
         $(obj)/gconf.glade
 
-###
-# The following requires flex/bison/gperf
-# By default we use the _shipped versions, uncomment the following line if
-# you are modifying the flex/bison src.
-# LKC_GENPARSER := 1
-
-ifdef LKC_GENPARSER
-
-$(obj)/zconf.tab.c: $(src)/zconf.y
-$(obj)/lex.zconf.c: $(src)/zconf.l
-$(obj)/zconf.hash.c: $(src)/zconf.gperf
-
-%.tab.c: %.y
-        bison -l -b $* -p $(notdir $*) $<
-        cp $@ $@_shipped
-
-lex.%.c: %.l
-        flex -L -P$(notdir $*) -o$@ $<
-        cp $@ $@_shipped
-
-%.hash.c: %.gperf
-        gperf < $< > $@
-        cp $@ $@_shipped
-
-endif