From 598893002745690e57692ca5bf6fb9ff04604a1b Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 23 Mar 2018 22:04:30 +0900 Subject: .gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore These patterns are common to host programs that require lexer and parser. Move them to the top .gitignore. Signed-off-by: Masahiro Yamada Acked-by: Frank Rowand --- scripts/dtc/.gitignore | 3 --- 1 file changed, 3 deletions(-) (limited to 'scripts/dtc') diff --git a/scripts/dtc/.gitignore b/scripts/dtc/.gitignore index cdabdc95a6e7..2e6e60d64ede 100644 --- a/scripts/dtc/.gitignore +++ b/scripts/dtc/.gitignore @@ -1,4 +1 @@ dtc -dtc-lexer.lex.c -dtc-parser.tab.c -dtc-parser.tab.h -- cgit v1.2.3 From 9a8dfb394c046742b2ac7444ba42272e11e9989d Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 23 Mar 2018 22:04:31 +0900 Subject: kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile Files suffixed by .lex.c, .tab.[ch] are generated lexers, parsers, respectively. Clean them up globally from the top Makefile. Some of the final host programs those lexer/parser are linked into are necessary for building external modules, but the intermediates are unneeded. They can be cleaned away by 'make clean' instead of 'make mrproper'. Signed-off-by: Masahiro Yamada Acked-by: Frank Rowand --- scripts/dtc/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'scripts/dtc') diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile index a88b8c9bf46d..d17ba6427740 100644 --- a/scripts/dtc/Makefile +++ b/scripts/dtc/Makefile @@ -28,7 +28,5 @@ HOSTCFLAGS_dtc-parser.tab.o := $(HOSTCFLAGS_DTC) # dependencies on generated files need to be listed explicitly $(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h -# generated files need to include *.cmd and be cleaned explicitly -generated-files := dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h -targets := $(generated-files) -clean-files := $(generated-files) +# generated files need to include *.cmd +targets := dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h -- cgit v1.2.3 From b23d1a241f4eb44ae55785c9b65274717c8e2c1e Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 23 Mar 2018 22:04:33 +0900 Subject: kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically Files generated by if_changed* must be added to 'targets' to include *.cmd files. Otherwise, they would be regenerated every time. The build system automatically adds objects to 'targets' where appropriate, such as obj-y, extra-y, etc. but does nothing for intermediate files. So, each Makefile needs to add them by itself. There are some common cases where objects are generated by chained rules. Lexers and parsers are compiled like follows: %.lex.o <- %.lex.c <- %.l %.tab.o <- %.tab.c <- %.y They are common patterns, so it is reasonable to take care of them in the core Makefile instead of requiring each Makefile to do so. At this moment, you cannot delete 'target += zconf.lex.c' in the Kconfig Makefile because zconf.lex.c is included from zconf.tab.c instead of being compiled separately. It should be deleted after Kconfig is more refactored. Signed-off-by: Masahiro Yamada Acked-by: Frank Rowand --- scripts/dtc/Makefile | 3 --- 1 file changed, 3 deletions(-) (limited to 'scripts/dtc') diff --git a/scripts/dtc/Makefile b/scripts/dtc/Makefile index d17ba6427740..9cac65b7419c 100644 --- a/scripts/dtc/Makefile +++ b/scripts/dtc/Makefile @@ -27,6 +27,3 @@ HOSTCFLAGS_dtc-parser.tab.o := $(HOSTCFLAGS_DTC) # dependencies on generated files need to be listed explicitly $(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h - -# generated files need to include *.cmd -targets := dtc-lexer.lex.c dtc-parser.tab.c dtc-parser.tab.h -- cgit v1.2.3