aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/config
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2019-06-20 17:02:30 +0200
committerJonas Gorski <jonas.gorski@gmail.com>2019-06-20 17:11:07 +0200
commit0096a1cf0015e483b99e51c74f2f0bbae7247342 (patch)
tree500f69a7b8b04d8a12ac7598b0c595d7c3451452 /scripts/config
parent1d34f99b1c0412a02955b10283e19cb903cc5b50 (diff)
downloadupstream-0096a1cf0015e483b99e51c74f2f0bbae7247342.tar.gz
upstream-0096a1cf0015e483b99e51c74f2f0bbae7247342.tar.bz2
upstream-0096a1cf0015e483b99e51c74f2f0bbae7247342.zip
scripts/config: fix *c_shipped build depency tracking
The Makefile was missing dependencies on *c_shipped, so changes never triggered a rebuild. Add these as optional dependencies so their absence isn't treated as an error. In addition, fix a typo preventing the zconf.lex.o from being removed on clean. Fixes: 9d5510a500a1 ("build: add new menuconfig code based on linux 3.9") Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Acked-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'scripts/config')
-rw-r--r--scripts/config/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/config/Makefile b/scripts/config/Makefile
index 745a5d0f84..8bb62d233c 100644
--- a/scripts/config/Makefile
+++ b/scripts/config/Makefile
@@ -31,7 +31,7 @@ lxdialog-objs := \
lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o \
lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o
-clean-files := zconf.tab.c lex.zconf.c zconf.hash.c
+clean-files := zconf.tab.c zconf.lex.c zconf.hash.c
# Remove qconf junk files
clean-files += $(qconf-cxxobjs) qconf.moc .tmp_qtcheck qconf
@@ -55,9 +55,9 @@ zconf.tab.o: zconf.lex.c zconf.hash.c confdata.c
kconfig_load.o: lkc_defs.h
-zconf.tab.c: zconf.y
-zconf.lex.c: zconf.l
-zconf.hash.c: zconf.gperf
+zconf.tab.c: zconf.y $(wildcard zconf.tab.c_shipped)
+zconf.lex.c: zconf.l $(wildcard zconf.lex.c_shipped)
+zconf.hash.c: zconf.gperf $(wildcard zconf.hash.c_shipped)
%.tab.c: %.y
cp $@_shipped $@ || bison -l -b $* -p $(notdir $*) $<