X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=regen.mk.in;h=7150bb1849870e146472d3f23022fa1b58331fa0;hp=7826ff224c26eb4eb63e9de41fe5b23e7f754834;hb=cf4ae9ff56d9313777f95d53092412023f806571;hpb=e2027350c5bd67fac28551f84f0f0a469342feb5

diff --git a/regen.mk.in b/regen.mk.in
index 7826ff2..7150bb1 100644
--- a/regen.mk.in
+++ b/regen.mk.in
@@ -5,7 +5,7 @@
 
 # Usage:
 #   include subdirmk/regen.mk
-# (probably in toplevel Subdir.sd.mk)
+# (probably in toplevel Dir.sd.mk)
 #
 # Arranges that config.status is automatically rerun to update
 # makefiles from templates, whenever a template *.sd.mk or *.mk.in is
@@ -20,8 +20,8 @@
 # of regen.mk).
 #
 # Also provides a `realclean::' target at the toplevel which deletes
-# the autoconf output.  This may be made into a recursive target
-# by mentioning &TARGETS_realclean in appropriate .sd.mk.
+# the autoconf output.  (This is suitable for being part of a recursive
+# target creaed by setting &TARGETS_realclean in appropriate .sd.mk.)
 
 CONFIGURE	?= configure
 CONFIGURE_AC	?= $(CONFIGURE).ac
@@ -55,14 +55,16 @@ main.mk $(SUBDIRMK_MAKEFILES) $(CONFIG_STATUS_OUTPUTS): .makefiles.stamp
 # 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.sd.mk and *.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
-# Subdir.sd.mk twice because if $(top_srcdir) is `.', make elides the
-# directory part from $?.
+# know affect only one output (Dir.sd.mk, Final.sd.mk and *.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 Dir.sd.mk twice because if $(top_srcdir) is `.', make
+# elides the directory part from $?.  Similarly but not identically
+# Final.sd.mk.
 	$(SUBDIRMK_REGEN_NDEBUG): REGEN STAMP WANTS DEPS=$?
 	./$(CONFIG_STATUS) $(if					\
-		$(filter-out Subdir.sd.mk %/Subdir.sd.mk	\
+		$(filter-out Dir.sd.mk %/Dir.sd.mk		\
+			     Final.sd.mk $(top_srcdir)/Final.sd.mk \
 			     %.mk.in				\
 			, $?),,					\
 		$(patsubst $(top_srcdir)/%,%, $(sort		\