kconfig: migrate parser to implicit rules

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>

diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore
index 624f6502e03e704b7be881817924cddbbdb708f1..ee120d441565422f0a6283b55ab5258fb61de9e7 100644 (file)
--- a/scripts/kconfig/.gitignore
+++ b/scripts/kconfig/.gitignore
@@ -2,7 +2,7 @@
 # Generated files
 #
 config*
-lex.*.c
+*.lex.c
 *.tab.c
 *.tab.h
 zconf.hash.c

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index bde4529a4d4ed42726ef83fe45568c326f333fa1..ee3f4fa0e04fb0ba841dcadf022aa31851ef9d38 100644 (file)
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -223,6 +223,9 @@ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC)
 HOSTCFLAGS_lex.zconf.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
 
@@ -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 -C < $< > $@
-       cp $@ $@_shipped
-
-endif

diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 377d04d832d1bc27caec4d311b07a64e18d13b21..c38cc5aa8ed19ca55a22bc6b10034af01063443f 100644 (file)
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -733,7 +733,7 @@ void zconfdump(FILE *out)
        }
 }
 
-#include "lex.zconf.c"
+#include "zconf.lex.c"
 #include "util.c"
 #include "confdata.c"
 #include "expr.c"