X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=subdirmk%2Fregen.mk.in;h=a5e426a6d428df4bfbe16d669d48986685f19bcb;hp=81739b9180e1ac72863eace9ca725841ab7ab349;hb=41682cf1c6108dce44a3e7a57eaacec0c0b058bd;hpb=47bbde5189c25e9a43c821d7c1db3d88a63eeafd

diff --git a/subdirmk/regen.mk.in b/subdirmk/regen.mk.in
index 81739b9..a5e426a 100644
--- a/subdirmk/regen.mk.in
+++ b/subdirmk/regen.mk.in
@@ -1,20 +1,51 @@
+# 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
-CONFIG_STATUS 	?= config.status
+CONFIGURE_AC	?= $(CONFIGURE).ac
+CONFIG_STATUS	?= config.status
 
-$(top_srcdir)/$(CONFIGURE): $(top_srcdir)/$(CONFIGURE_AC)
-	cd &^ && autoconf
+CONFIGURE_ACS	+= $(CONFIGURE_AC)
+CONFIGURE_ACS	+= subdirmk/subdirmk.ac
+
+$(top_srcdir)/$(CONFIGURE): $(addprefix $(top_srcdir)/,$(CONFIGURE_ACS))
+	cd $(top_srcdir) && autoconf
 
 $(CONFIG_STATUS): $(top_srcdir)/$(CONFIGURE)
 	./$(CONFIG_STATUS) --recheck
 
-MAKEFILES += subdirmk/regen.mk
+# Normally, generate will add all the inputs to MAKEFILE_TEMPLATES.
+MAKEFILE_TEMPLATES += $(addprefix $(top_srcdir)/, $(addsuffix .in, \
+	@_SUBDIRMK_MAKEFILES@ \
+	))
 
-main.mk $(MAKFILES): makefiles.phantom
-.INTERMEDIATE: makefiles.phantom
-makefiles.phantom: 						\
+main.mk $(MAKEFILES): .makefiles.stamp ;
+.makefiles.stamp:						\
 		$(top_srcdir)/subdirmk/generate			\
 		$(CONFIG_STATUS)				\
-		$(foreach m,$(MAKEFILES),$(top_srcdir)/$(m).in)
-	./$(CONFIG_STATUS)
+		$(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
+	$(RM) main.mk subdirmk/regen.mk $(MAKEFILES)
+	$(RM) $(addsuffix Makefile,$(dir $(MAKEFILES)))
+
+-include $(ALL_DEPFILES)