X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=subdirmk%2Fregen.mk.in;h=948ef4e0791eccde5ab19c84215d20e5cc19a6a9;hp=2661ee18758ece403ce046528f5cc5e6fc0f8ddd;hb=9bad147b1a52bbef3021fb3f9100b4fa52d0dce6;hpb=5c370689670a4401baa5bb111f136d6ec82d0547

diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in
index 2661ee1..948ef4e 100644
--- a/subdirmk/regen.mk.in
+++ b/subdirmk/regen.mk.in
@@ -1,3 +1,7 @@
+# subdirmk - rules for regenerating makefiles etc.
+#  Copyright 2019 Mark Wooding
+#  Copyright 2019 Ian Jackson
+# SPDX-License-Identifier: LGPL-2.0-or-later
 
 CONFIGURE	?= configure
 CONFIGURE_AC 	?= $(CONFIGURE).ac
@@ -12,22 +16,32 @@ $(top_srcdir)/$(CONFIGURE): $(addprefix $(top_srcdir)/,$(CONFIGURE_ACS))
 $(CONFIG_STATUS): $(top_srcdir)/$(CONFIGURE)
 	./$(CONFIG_STATUS) --recheck
 
-MAKEFILES += subdirmk/regen.mk
+MAKEFILE_TEMPLATES += $(top_srcdir)/Perdir.sd.mk
+MAKEFILE_TEMPLATES += $(addprefix $(top_srcdir)/, $(addsuffix .in, \
+	@_SUBDIRMK_MAKEFILES@ \
+	))
 
-main.mk $(MAKEFILES): .config.status.needed
-	./$<
-.INTERMEDIATE: .config.status.needed
-.config.status.needed: 						\
+main.mk $(MAKEFILES): .makefiles.stamp ;
+.makefiles.stamp: 						\
 		$(top_srcdir)/subdirmk/generate			\
 		$(CONFIG_STATUS)				\
-		$(top_srcdir)/Perdir.mk.in			\
-		$(foreach m,$(MAKEFILES),$(top_srcdir)/$(m).in)
-	: $?
-	set -e; printf >$@.tmp "#!/bin/sh\nset -e\n%s %s"	\
-		"./$(CONFIG_STATUS)"				\
-		"$(if	$(filter-out %.mk.in, $?),,		\
-			$(patsubst %.mk.in,%.mk,$?))"	;	\
-		chmod +x $@.tmp; mv -f $@.tmp $@
+		$(MAKEFILE_TEMPLATES)
+# 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.sd.mk %/Subdir.sd.mk	\
+			     %.mk.in				\
+			, $?),,					\
+		$(patsubst $(top_srcdir)/%,%, $(sort		\
+			$(patsubst %.sd.mk,%.mk,$(filter %.sd.mk,$?)) \
+			$(patsubst %.mk.in,%.mk,$(filter %.mk.in,$?)))))
+	touch $@
 
 realclean:: clean
 	$(RM) config.status config.log