&:include feature

[subdirmk.git] / subdirmk / regen.mk.in

diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in
index f9d7240d412dd0cbb2583b5e8a2bdb08e49fe18b..bc05e722be1a836c525b3cc40c8ae0afb8bb512d 100644 (file)
--- a/subdirmk/regen.mk.in
+++ b/subdirmk/regen.mk.in
@@ -14,14 +14,29 @@ $(CONFIG_STATUS): $(top_srcdir)/$(CONFIGURE)
 
 MAKEFILES += subdirmk/regen.mk
 
-main.mk $(MAKEFILES): makefiles.phantom ;
-.INTERMEDIATE: makefiles.phantom
-makefiles.phantom:                                             \
+MAKEFILE_TEMPLATES += $(top_srcdir)/Perdir.mk.in
+
+main.mk $(MAKEFILES): .makefiles.stamp ;
+.makefiles.stamp:                                              \
                $(top_srcdir)/subdirmk/generate                 \
                $(CONFIG_STATUS)                                \
-               $(top_srcdir)/Perdir.mk.in                      \
+               $(MAKEFILE_TEMPLATES)                           \
                $(foreach m,$(MAKEFILES),$(top_srcdir)/$(m).in)
-       ./$(CONFIG_STATUS)
+# This filtering arranges that we can often run config.status to
+# generate only particular output files.  We look for *inputs* that
+# have changed.  If the only inputs that have changed are ones that we
+# know affect only one output (Subdir.mk.in and regen.mk.in), we pass
+# config.status the corresponding output file names.  Otherwise we
+# pass nothing and config.status does them all.  We need to mention
+# regen.mk.in twice because if $(top_srcdir) is `.', make elides the
+# directory part from $?.
+       ./$(CONFIG_STATUS) $(if                                 \
+               $(filter-out Subdir.mk.in %/Subdir.mk.in        \
+                       subdirmk/regen.mk.in                    \
+                       $(top_srcdir)/subdirmk/regen.mk.in      \
+                       , $?),,                                 \
+               $(patsubst %.mk.in,%.mk,$(filter %.mk.in,$?)))
+       touch $@
 
 realclean:: clean
        $(RM) config.status config.log