X-Git-Url: https://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/83acbb95d2f181cd67f08f1bae4572de9768b63b..92a89700c65e52fac8c2cace51a7112d60b3f42f:/snippet/glconfig.mk

diff --git a/snippet/glconfig.mk b/snippet/glconfig.mk
index dd999af..b18d50b 100644
--- 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
@@ -16,9 +16,9 @@
 GLCONFIG = @GLSRC@/glconfig.h
 GLCAT    = cat /dev/null
 
-GLSYM_V   = $(GLSYM_V_$(V))
-GLSYM_V_  = $(GLSYM_V_$(AM_DEFAULT_VERBOSITY))
-GLSYM_V_0 = @echo "  GLSYM " $<;
+GLSYM_V   = $(GLSYM_V_@AM_V@)
+GLSYM_V_  = $(GLSYM_V_@AM_DEFAULT_V@)
+GLSYM_V_0 = @printf '  %$(DX_ALIGN_V)s %s\n' 'GLSYM   ' $<;
 
 gnulib_symfiles = $(gnulib_lt_objects:.lo=.glsym)
 gnulib_headers += $(GLCONFIG)
@@ -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