regen.mk.in: Debugging, controlled by SUBDIRMK_REGEN_NDEBUG

And enable this in test/example/check.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/regen.mk.in b/regen.mk.in
index 5f24b08fd4e504cc50019a276df7850abb9b9dbf..b9625d7bb28954405b31eab152888a45861ab155 100644 (file)
--- a/regen.mk.in
+++ b/regen.mk.in
@@ -24,6 +24,9 @@ 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
 
@@ -36,7 +39,8 @@ MAKEFILE_TEMPLATES += $(addprefix $(top_srcdir)/, $(addsuffix .in, \
        ))
 
 main.mk $(SUBDIRMK_MAKEFILES) $(CONFIG_STATUS_OUTPUTS): .makefiles.stamp
-               @:
+       $(SUBDIRMK_REGEN_NDEBUG): REGEN STAMP CAUSES TARGET=$@
+
 .makefiles.stamp:                                              \
                $(top_srcdir)/subdirmk/generate                 \
                $(CONFIG_STATUS)                                \
@@ -49,6 +53,7 @@ main.mk $(SUBDIRMK_MAKEFILES) $(CONFIG_STATUS_OUTPUTS): .makefiles.stamp
 # 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 $?.
+       $(SUBDIRMK_REGEN_NDEBUG): REGEN STAMP WANTS DEPS=$?
        ./$(CONFIG_STATUS) $(if                                 \
                $(filter-out Subdir.sd.mk %/Subdir.sd.mk        \
                             %.mk.in                            \

diff --git a/tests/example/check b/tests/example/check
index d5d282ffc4ba4816a36889b44f57516a7a7ceef7..a5b27ba043da0ce0485ff9ad9a509747557f21ee 100755 (executable)
--- a/tests/example/check
+++ b/tests/example/check
@@ -3,6 +3,9 @@ set -ex
 
 cd example
 
+SUBDIRMK_REGEN_NDEBUG=''
+export SUBDIRMK_REGEN_NDEBUG
+
 #----- in-tree build -----
 
 git clean -xdff