X-Git-Url: https://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/4967f55159b228c15e19dbe9d7436bbe76da0b87..f14190dbcda7e9cf94e1691163081b98ecd2f3b1:/snippet/autotest.mk

diff --git a/snippet/autotest.mk b/snippet/autotest.mk
index d5adc9d..10acd71 100644
--- a/snippet/autotest.mk
+++ b/snippet/autotest.mk
@@ -1,8 +1,12 @@
-# Copyright © 2015,2019-2020 Nick Bowler
+# Copyright © 2015,2019-2021 Nick Bowler
 #
-# Automake fragment to hook up a basic Autotest test suite into the build.
-# It is expected that a testsuite.at file exists in $(srcdir).  The
-# testsuite will be output to $(builddir)/testsuite.
+# Automake fragment to hook up a basic Autotest test suite into the
+# build.  It is expected that a testsuite.at file exists in $(srcdir).
+# The testsuite will be output to $(builddir)/testsuite.
+#
+# The DX_AUTOMAKE_COMPAT macro must be expanded by configure.ac to
+# provide necessary substitutions.  If DX_PROG_AUTOTEST is used, this
+# will be included automatically.
 #
 # You must define the AUTOTEST variable to the Autotest program (normally,
 # this is autom4te -l autotest).  The DX_PROG_AUTOTEST macro can be used
@@ -31,7 +35,7 @@ clean-autotest:
 
 maintainer-clean-local: maintainer-clean-autotest
 maintainer-clean-autotest:
-	rm -f testsuite package.m4
+	rm -f testsuite testsuite.deps package.m4
 .PHONY: maintainerclean-autotest
 
 package.m4: $(top_srcdir)/configure.ac
@@ -53,27 +57,20 @@ DX_AUTOTEST_ERROR = @:; { \
 	  printf 'Autoconf package: <https://gnu.org/s/autoconf/>\n'; \
 	} 1>&2; false
 
-DX_ATFLAGS = -I$(srcdir) $(ATFLAGS)
+DX_AUTOTEST = $(AUTOTEST) -I$(srcdir) $(ATFLAGS)
 
 testsuite: testsuite.at package.m4
 if !HAVE_AUTOTEST
 	$(DX_AUTOTEST_ERROR)
 endif
-	$(AM_V_GEN) $(AUTOTEST) $(DX_ATFLAGS) -p m4_include -o $@.tmp \
+	$(AM_V_GEN) $(DX_AUTOTEST) -p m4_include -o $@.tmp testsuite.at
+	$(AM_V_at) $(DX_AUTOTEST) -t m4_include:'$$1' -o $@.deps.tmp \
 	  testsuite.at
-	$(AM_V_at) :; { \
-	  $(AUTOTEST) $(DX_ATFLAGS) -t m4_include:'$@: $$1' testsuite.at; \
-	  $(AUTOTEST) $(DX_ATFLAGS) -t m4_include:'$$1:' testsuite.at; \
-	} >$(DEPDIR)/$(@F).P
+	$(AM_V_at) exec 3<$@.deps.tmp 4>$(DEPDIR)/$(@F).P; \
+	  while read f <&3; do printf '$@: %s\n%s:\n' "$$f" "$$f" >&4; done
+	$(AM_V_at) mv -f $@.deps.tmp $@.deps
 	$(AM_V_at) mv -f $@.tmp $@
-
 testsuite.deps: testsuite
-if !HAVE_AUTOTEST
-	$(DX_AUTOTEST_ERROR)
-endif
-	$(AM_V_GEN) $(AUTOTEST) $(DX_ATFLAGS) -t m4_include:'$$1' -o $@.tmp \
-	  testsuite.at
-	$(AM_V_at) mv -f $@.tmp $@
 
 dist-hook: dist-autotest-deps
 dist-autotest-deps: testsuite.deps
@@ -88,13 +85,27 @@ dist-autotest-deps: testsuite.deps
 EXTRA_DIST += testsuite testsuite.at testsuite.deps package.m4
 DISTCLEANFILES += atconfig $(DEPDIR)/testsuite.P
 
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testsuite.P@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/testsuite.P@am__quote@@dx_include_marker@
 
 # Automake 1.16 and newer use make rules to generate the dependency stubs.
-# we must hook those which is kind of annoying to do.  This should be harmless
-# on previous versions which generate the stubs directly in config.status.
-_dx_autotest_depfiles = am--depfiles
-$(_dx_autotest_depfiles): $(DEPDIR)/testsuite.P
-$(DEPDIR)/testsuite.P:
+# Use this opportunity to generate accurate prerequisites from distributed
+# testsuite dependencies, needed so that make knows to rebuild the testsuite
+# when source files are modified in a distribution tarball, or after a make
+# distclean.
+#
+# With older Automake the stubs are generated directly in config.status.
+# Since this rule is ignored things should still work but the build may
+# miss modifications to the testsuite on the first build from a tarball.
+@dx_depfiles_target@: ./$(DEPDIR)/testsuite.P
+./$(DEPDIR)/testsuite.P:
 	@$(MKDIR_P) $(@D)
-	@echo '# dummy' >$@-t && mv -f $@-t $@
+	@if test -f $(builddir)/testsuite.deps; then \
+	  exec 3<$(builddir)/testsuite.deps; \
+	elif test -f $(srcdir)/testsuite.deps; then \
+	  exec 3<$(srcdir)/testsuite.deps; \
+	else \
+	  echo '# dummy' >$@-t && exit; \
+	fi; exec 4>$@-t; while read f <&3; do \
+	  printf 'testsuite: %s\n%s:\n' "$$f" "$$f" >&4; \
+	done
+	@mv -f $@-t $@