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

diff --git a/snippet/autotest.mk b/snippet/autotest.mk
index 293a858..d5adc9d 100644
--- a/snippet/autotest.mk
+++ b/snippet/autotest.mk
@@ -1,4 +1,4 @@
-# Copyright © 2015 Nick Bowler
+# Copyright © 2015,2019-2020 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
@@ -34,7 +34,7 @@ maintainer-clean-autotest:
 	rm -f testsuite package.m4
 .PHONY: maintainerclean-autotest
 
-package.m4:
+package.m4: $(top_srcdir)/configure.ac
 	$(AM_V_GEN) :; { \
 	  printf 'm4_define([%s], [%s])\n' \
 	    AT_PACKAGE_NAME      '$(PACKAGE_NAME)' \
@@ -53,14 +53,17 @@ DX_AUTOTEST_ERROR = @:; { \
 	  printf 'Autoconf package: <https://gnu.org/s/autoconf/>\n'; \
 	} 1>&2; false
 
+DX_ATFLAGS = -I$(srcdir) $(ATFLAGS)
+
 testsuite: testsuite.at package.m4
 if !HAVE_AUTOTEST
 	$(DX_AUTOTEST_ERROR)
 endif
-	$(AM_V_GEN) $(AUTOTEST) $(ATFLAGS) -p m4_include -o $@.tmp testsuite.at
+	$(AM_V_GEN) $(AUTOTEST) $(DX_ATFLAGS) -p m4_include -o $@.tmp \
+	  testsuite.at
 	$(AM_V_at) :; { \
-	  $(AUTOTEST) $(ATFLAGS) -t m4_include:'$@: $$1' testsuite.at; \
-	  $(AUTOTEST) $(ATFLAGS) -t m4_include:'$$1:' testsuite.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) mv -f $@.tmp $@
 
@@ -68,7 +71,7 @@ testsuite.deps: testsuite
 if !HAVE_AUTOTEST
 	$(DX_AUTOTEST_ERROR)
 endif
-	$(AM_V_GEN) $(AUTOTEST) $(ATFLAGS) -t m4_include:'$$1' -o $@.tmp \
+	$(AM_V_GEN) $(AUTOTEST) $(DX_ATFLAGS) -t m4_include:'$$1' -o $@.tmp \
 	  testsuite.at
 	$(AM_V_at) mv -f $@.tmp $@
 
@@ -86,3 +89,12 @@ 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@
+
+# 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:
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && mv -f $@-t $@