X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=regen.mk.in;h=06b2fbd08e1ce6fa56b100cbd3422fcf6d34d7df;hp=c4002a623a650a5127eb40c0d29b4c3c8c7cf57a;hb=ae3f87445e8e51bc42d3a833f96ff79ca9ffa10d;hpb=a1e52614e600bed8e51b461e6569f2cd263e82bb

diff --git a/regen.mk.in b/regen.mk.in
index c4002a6..06b2fbd 100644
--- a/regen.mk.in
+++ b/regen.mk.in
@@ -13,9 +13,15 @@
 #
 # If you add includes to configure.ac, add them to CONFIGURE_ACS.
 #
+# Makefiles updated by config.status and passed to SUBDIRMK_MAKEFILES
+# in configure.ac are automatically handled too.  If you have other
+# files updated by config.status (eg, the output of autoheader) you
+# need to put them in CONFIG_STATUS_OUTPUTS (before your inclusion
+# 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
@@ -24,19 +30,24 @@ CONFIG_STATUS	?= config.status
 CONFIGURE_ACS	+= $(CONFIGURE_AC)
 CONFIGURE_ACS	+= subdirmk/subdirmk.ac
 
+# To turn on debugging here, export SUBDIRMK_REGEN_NDEBUG=''
+SUBDIRMK_REGEN_NDEBUG ?= @
+
 $(top_srcdir)/$(CONFIGURE): $(addprefix $(top_srcdir)/,$(CONFIGURE_ACS))
 	cd $(top_srcdir) && autoconf
 
 $(CONFIG_STATUS): $(top_srcdir)/$(CONFIGURE)
 	./$(CONFIG_STATUS) --recheck
 
-# Normally, generate will add all the inputs to MAKEFILE_TEMPLATES.
+# generate will add all its own inputs and outputs to these variables
+SUBDIRMK_MAKEFILES += @_SUBDIRMK_MAKEFILES@
 MAKEFILE_TEMPLATES += $(addprefix $(top_srcdir)/, $(addsuffix .in, \
 	@_SUBDIRMK_MAKEFILES@ \
 	))
 
 main.mk $(SUBDIRMK_MAKEFILES) $(CONFIG_STATUS_OUTPUTS): .makefiles.stamp
-		@:
+	$(SUBDIRMK_REGEN_NDEBUG): REGEN STAMP CAUSES TARGET=$@
+
 .makefiles.stamp:						\
 		$(top_srcdir)/subdirmk/generate			\
 		$(CONFIG_STATUS)				\
@@ -44,11 +55,12 @@ 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.mk.in and regen.mk.in), we pass
+# 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
-# regen.mk.in twice because if $(top_srcdir) is `.', make elides the
+# Subdir.sd.mk twice because if $(top_srcdir) is `.', make elides the
 # directory part from $?.
+	$(SUBDIRMK_REGEN_NDEBUG): REGEN STAMP WANTS DEPS=$?
 	./$(CONFIG_STATUS) $(if					\
 		$(filter-out Subdir.sd.mk %/Subdir.sd.mk	\
 			     %.mk.in				\