espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/build_kconfig_deps' into 'master'

Browse Source 
build: make clean should remove all .d files in tools/kconfig

See merge request !1302
This commit is contained in:
Angus Gratton
2017-09-22 12:42:37 +08:00
parent 976135c3a8 a361a00405
commit c4e65d6a95
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/kconfig/Makefile
View File

@@ -173,9 +173,12 @@ gconf-objs := gconf.o zconf.tab.o
hostprogs-y := conf nconf mconf kxgettext qconf gconf hostprogs-y := conf nconf mconf kxgettext qconf gconf
clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck *.d all-objs := $(conf-objs) $(mconf-objs) $(lxdialog)
all-deps := $(all-objs:.o=.d)
clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck
clean-files += zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h clean-files += zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h
clean-files += $(conf-objs) $(mconf-objs) conf mconf $(lxdialog) clean-files += $(all-objs) $(all-deps) conf mconf
# Check that we have the required ncurses stuff installed for lxdialog (menuconfig) # Check that we have the required ncurses stuff installed for lxdialog (menuconfig)
PHONY += dochecklxdialog PHONY += dochecklxdialog
@@ -307,8 +310,8 @@ zconf.hash.c: zconf.gperf
zconf.tab.c: zconf.y zconf.tab.c: zconf.y
bison -t -l -p zconf -o zconf.tab.c zconf.y bison -t -l -p zconf -o zconf.tab.c zconf.y
clean: clean:
rm -f $(clean-files) rm -f $(clean-files)
-include $(wildcard *.d) -include $(all-deps)
-include $(wildcard lxdialog/*.d)

2
tools/kconfig/lxdialog/check-lxdialog.sh
View File

@@ -49,7 +49,7 @@ ccflags()
# Temp file, try to clean up after us # Temp file, try to clean up after us
tmp=.lxdialog.tmp tmp=.lxdialog.tmp
trap "rm -f $tmp" 0 1 2 3 15 trap "rm -f $tmp ${tmp%.tmp}.d" 0 1 2 3 15
# Check if we can link to ncurses # Check if we can link to ncurses
check() { check() {