domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/config: fix *c_shipped build depency tracking

Browse Source 
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: 9d5510a500 ("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>
(cherry picked from commit 0096a1cf00)
This commit is contained in:
Jonas Gorski
2019-06-20 17:02:30 +02:00
committed by Jo-Philipp Wich
parent 0bfac320ea
commit f79e6e01bd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/config/Makefile
View File

@@ -31,7 +31,7 @@ lxdialog-objs := \
lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o \ lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o \
lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.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 # Remove qconf junk files
clean-files += $(qconf-cxxobjs) qconf.moc .tmp_qtcheck qconf 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 kconfig_load.o: lkc_defs.h
zconf.tab.c: zconf.y zconf.tab.c: zconf.y $(wildcard zconf.tab.c_shipped)
zconf.lex.c: zconf.l zconf.lex.c: zconf.l $(wildcard zconf.lex.c_shipped)
zconf.hash.c: zconf.gperf zconf.hash.c: zconf.gperf $(wildcard zconf.hash.c_shipped)
%.tab.c: %.y %.tab.c: %.y
cp $@_shipped $@ || bison -l -b $* -p $(notdir $*) $< cp $@_shipped $@ || bison -l -b $* -p $(notdir $*) $<