From 1c735777327e973ad2cb5bf53a3d81d793e46411 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sun, 7 Mar 2021 00:16:28 -0500 Subject: [PATCH] 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. --- scripts/fix-gnulib.pl | 4 ++-- snippet/glconfig.mk | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/scripts/fix-gnulib.pl b/scripts/fix-gnulib.pl index a59e4a6..16eac47 100755 --- 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_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 diff --git a/snippet/glconfig.mk b/snippet/glconfig.mk index b18d50b..71ca880 100644 --- 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 @@ -78,13 +78,12 @@ glconfig-gen: $(gnulib_symfiles) > $(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. -_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 $@ -- 2.43.0