diff options
| author | Jonas Gorski <jonas.gorski@gmail.com> | 2019-06-20 17:02:30 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-09-04 13:16:14 +0200 |
| commit | f79e6e01bd78b84316418f9981d7d1b6c3900e8c (patch) | |
| tree | 1cf0a9fb93dcb02455f375997b73f1d2b54754ff /scripts | |
| parent | 0bfac320ea5a37b82a9574bc673d1ab55c278831 (diff) | |
| download | openwrt-f79e6e01bd78b84316418f9981d7d1b6c3900e8c.tar.gz openwrt-f79e6e01bd78b84316418f9981d7d1b6c3900e8c.tar.bz2 openwrt-f79e6e01bd78b84316418f9981d7d1b6c3900e8c.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>
(cherry picked from commit 0096a1cf0015e483b99e51c74f2f0bbae7247342)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/config/Makefile | 8 |
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 $*) $< |