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>

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 77cce68c4d63255faae65c2eecfe0de9a78fbec6..36f7990c5701202e57fca772331c1d0bab40cf1c 100644 (file)
--- 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 d17ba6427740086d7239979572312949a4569216..9cac65b7419c6aeb93252e7016d7cbfda070cb8d 100644 (file)
--- 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 a9565eb6a292b92c90dc89405da2381462d18d1e..ef0287e429578bd897b25dd68f121ac4f1e96e78 100644 (file)
--- 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 1dcd797d7e50aeb0a8f9b53c91d9f93d9671a9b7..5def8779d7d85df5402fc6e5084435f0577b31ae 100644 (file)
--- 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