Fix depfiles compatibility with modern Automake.

Automake 1.16 changes how depfiles are created.  It is now necessary
to define a rule which creates the stub and additionally we must clean
them explicitly.  This is a bit annoying to do but that's the price of
relying on undocumented internal behaviour, I guess.

The extra rule should be harmless when using Automake 1.15.

diff --git a/snippet/autotest.mk b/snippet/autotest.mk
index 738e321851496ac33b23bc4c05d2af73cdfd4f73..0a10c9f792b688b4b4b666153908d81fce4c7f09 100644 (file)
--- a/snippet/autotest.mk
+++ b/snippet/autotest.mk
@@ -1,4 +1,4 @@
-# Copyright © 2015 Nick Bowler
+# Copyright © 2015,2019 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
@@ -89,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 $@

diff --git a/snippet/glconfig.mk b/snippet/glconfig.mk
index 4bf112ec478808d170a6f94983ed029f21ec7b80..b18d50be1443e36fc47d891de5b8c56a29683a29 100644 (file)
--- a/snippet/glconfig.mk
+++ b/snippet/glconfig.mk
@@ -1,4 +1,4 @@
-# Copyright © 2011 Nick Bowler
+# Copyright © 2011-2013,2019 Nick Bowler
 #
 # Automake fragment to generate a Gnulib config header to rewrite exported
 # symbols.  This fragment relies on the Gnulib makefile postprocessing done by
@@ -79,3 +79,13 @@ glconfig-gen: $(gnulib_symfiles)
 .PHONY: glconfig-gen
 
 @AMDEP_TRUE@@am__include@ @am__quote@@GLSRC@/$(DEPDIR)/glconfig.Ph@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_glconfig_depfiles = am--depfiles
+$(_dx_glconfig_depfiles): @GLSRC@/$(DEPDIR)/glconfig.Ph
+@GLSRC@/$(DEPDIR)/glconfig.Ph:
+       @$(MKDIR_P) $(@D)
+       @echo '# dummy' >$@-t && mv -f $@-t $@
+DISTCLEANFILES += @GLSRC@/$(DEPDIR)/glconfig.Ph