X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=regen.mk.in;h=11e8a32f8e725547f58d6c183839320f53f04d03;hp=5f24b08fd4e504cc50019a276df7850abb9b9dbf;hb=a4d9f732b93f499b96e3a52459c5f7d2366da14a;hpb=eefd9e096adc7360a0dd7c994cb8b5c09468c12e diff --git a/regen.mk.in b/regen.mk.in index 5f24b08..11e8a32 100644 --- a/regen.mk.in +++ b/regen.mk.in @@ -24,19 +24,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) \ @@ -49,6 +54,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 \