Fix glconfig depfiles generation with non-GNU makes.

Just like with Autotest, the generation depends on $MAKE set at
configure time, and this was never tried.  Apply the same fix to
glconfig.mk.

diff --git a/scripts/fix-gnulib.pl b/scripts/fix-gnulib.pl
index a59e4a6e3d66b1eab748754fc33b6d5eba3349f8..16eac47a09bb585c763854a5c891faf9dbb9c874 100755 (executable)
--- a/scripts/fix-gnulib.pl
+++ b/scripts/fix-gnulib.pl
@@ -270,8 +270,8 @@ if FALSE
 AC_SUBST([GLSRC], [lib])
 AC_CONFIG_LIBOBJ_DIR([lib])
 
 AC_SUBST([GLSRC], [lib])
 AC_CONFIG_LIBOBJ_DIR([lib])
 

-AC_DEFUN_ONCE([DX_GLSYM_PREFIX], [dnl
-AC_REQUIRE([DX_EXPORTED_SH])
+AC_DEFUN_ONCE([DX_GLSYM_PREFIX],
+[AC_REQUIRE([DX_AUTOMAKE_COMPAT])AC_REQUIRE([DX_EXPORTED_SH])

 AC_SUBST([GLSYM_PREFIX], [$1])
 ])
 EOF
 AC_SUBST([GLSYM_PREFIX], [$1])
 ])
 EOF

diff --git a/snippet/glconfig.mk b/snippet/glconfig.mk
index b18d50be1443e36fc47d891de5b8c56a29683a29..71ca8802fac33026f42a33930f893f3099bc3aaf 100644 (file)
--- a/snippet/glconfig.mk
+++ b/snippet/glconfig.mk
@@ -1,4 +1,4 @@
-# Copyright © 2011-2013,2019 Nick Bowler
+# Copyright © 2011-2013, 2019, 2021 Nick Bowler

 #
 # Automake fragment to generate a Gnulib config header to rewrite exported
 # symbols.  This fragment relies on the Gnulib makefile postprocessing done by
 #
 # Automake fragment to generate a Gnulib config header to rewrite exported
 # symbols.  This fragment relies on the Gnulib makefile postprocessing done by


@@ -78,13 +78,12 @@ glconfig-gen: $(gnulib_symfiles)
                        > $(GLCONFIG).tmp
 .PHONY: glconfig-gen
 
                        > $(GLCONFIG).tmp
 .PHONY: glconfig-gen
 

-@AMDEP_TRUE@@am__include@ @am__quote@@GLSRC@/$(DEPDIR)/glconfig.Ph@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@@GLSRC@/$(DEPDIR)/glconfig.Ph@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.
 
 # 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
+@dx_depfiles_target@: @GLSRC@/$(DEPDIR)/glconfig.Ph

 @GLSRC@/$(DEPDIR)/glconfig.Ph:
        @$(MKDIR_P) $(@D)
        @echo '# dummy' >$@-t && mv -f $@-t $@
 @GLSRC@/$(DEPDIR)/glconfig.Ph:
        @$(MKDIR_P) $(@D)
        @echo '# dummy' >$@-t && mv -f $@-t $@