diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-23 22:04:33 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-04-07 19:04:02 +0900 |
| commit | b23d1a241f4eb44ae55785c9b65274717c8e2c1e (patch) | |
| tree | 3ba4d4c7da15273c2a62408dc43d789bbb9ca207 | |
| parent | 833e622459432ed5bc7cc58ffadb91b59c863a3a (diff) | |
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 <yamada.masahiro@socionext.com>
Acked-by: Frank Rowand <frowand.list@gmail.com>
| -rw-r--r-- | scripts/Makefile.build | 11 | ||||
| -rw-r--r-- | scripts/dtc/Makefile | 3 | ||||
| -rw-r--r-- | scripts/genksyms/Makefile | 2 | ||||
| -rw-r--r-- | scripts/kconfig/Makefile | 2 |
4 files changed, 12 insertions, 6 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 77cce68c4d63..36f7990c5701 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -538,6 +538,17 @@ $(call multi_depend, $(multi-used-m), .o, -objs -y -m) targets += $(multi-used-m) targets := $(filter-out $(PHONY), $(targets)) +# Add intermediate targets: +# When building objects with specific suffix patterns, add intermediate +# targets that the final targets are derived from. +intermediate_targets = $(foreach sfx, $(2), \ + $(patsubst %$(strip $(1)),%$(sfx), \ + $(filter %$(strip $(1)), $(targets)))) +# %.lex.o <- %.lex.c <- %.l +# %.tab.o <- %.tab.[ch] <- %.y +targets += $(call intermediate_targets, .lex.o, .lex.c) \ + $(call intermediate_targets, .tab.o, .tab.c .tab.h) + # Descending # --------------------------------------------------------------------------- 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 diff --git a/scripts/genksyms/Makefile b/scripts/genksyms/Makefile index a9565eb6a292..ef0287e42957 100644 --- a/scripts/genksyms/Makefile +++ b/scripts/genksyms/Makefile @@ -36,5 +36,3 @@ HOSTCFLAGS_lex.lex.o := -I$(src) # dependencies on generated files need to be listed explicitly $(obj)/lex.lex.o: $(obj)/parse.tab.h - -targets := lex.lex.c parse.tab.c parse.tab.h diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 1dcd797d7e50..5def8779d7d8 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -207,7 +207,7 @@ gconf-objs := gconf.o zconf.tab.o hostprogs-y := conf nconf mconf kxgettext qconf gconf -targets += zconf.tab.c zconf.lex.c +targets += zconf.lex.c clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck clean-files += gconf.glade.h clean-files += config.pot linux.pot |