X-Git-Url: https://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/e7d29006d05055ab5b7af44078668c1915d35262..HEAD:/snippet/glconfig.mk

diff --git a/snippet/glconfig.mk b/snippet/glconfig.mk
index b7ed4cc..42d024e 100644
--- a/snippet/glconfig.mk
+++ b/snippet/glconfig.mk
@@ -1,4 +1,4 @@
-# Copyright © 2011-2013, 2019, 2021-2022 Nick Bowler
+# Copyright © 2011-2013, 2019, 2021-2023 Nick Bowler
 #
 # Automake fragment to generate a Gnulib config header to rewrite exported
 # symbols.  This fragment relies on the Gnulib makefile postprocessing done by
@@ -32,7 +32,6 @@ gnulib_headers += $(GLCONFIG)
 		-c -o $(@D)/.syms/$(*F).o $<
 	$(AM_V_at) $(SHELL) $(top_builddir)/exported.sh \
 		$(@D)/.syms/$(*F).o > $(@D)/.syms/$(*F).sym
-$(gnulib_symfiles): $(gnulib_core_headers)
 
 clean-local: clean-glconfig
 clean-glconfig:
@@ -72,21 +71,28 @@ CLEANFILES += $(GLCONFIG)
 # The glconfig-gen target is intended only for use in recursive make
 # invocations.
 glconfig-gen: $(gnulib_symfiles)
+	$(AM_V_at) $(MKDIR_P) @GLSRC@
 	$(AM_V_at) depfiles=; symfiles=; \
 	for sym in $(gnulib_symfiles); do \
-		symdir=`expr "$$sym" : '\(.*/\)'`; \
-		symfile=`expr "$$sym" : '.*/\(.*\)' || printf '%s\n' "$$sym"`; \
-		symbase=$$symdir.syms/`expr "$$symfile" : '\(.*\)\..*'`; \
-		test -f "$$symbase.deps" && \
-			depfiles="$$depfiles $$symbase.deps"; \
-		symfiles="$$symfiles $$symbase.sym"; \
+	  symdir=`expr "$$sym" : '\(.*/\)'`; \
+	  symfile=`expr "$$sym" : '.*/\(.*\)' || printf '%s\n' "$$sym"`; \
+	  symbase=$$symdir.syms/`expr "$$symfile" : '\(.*\)\..*'`; \
+	  test -f "$$symbase.deps" && \
+	    depfiles="$$depfiles $$symbase.deps"; \
+	    symfiles="$$symfiles $$symbase.sym"; \
 	done; \
-		$(GLCAT) $$depfiles > @GLSRC@/$(DEPDIR)/glconfig.Ph && \
-		$(GLCAT) $$symfiles | sed 's/.*/#define & $(GLSYM_PREFIX)&/' \
-			> $(GLCONFIG).tmp
+	$(glconfig_nodeps) \
+	  || $(GLCAT) $$depfiles > @GLSRC@/$(DEPDIR)/glconfig.Ph || exit; \
+	$(GLCAT) $$symfiles | sed 's/.*/#define & $(GLSYM_PREFIX)&/' \
+	  >$(GLCONFIG).tmp
 .PHONY: glconfig-gen
 
-@AMDEP_TRUE@@am__include@ @am__quote@@GLSRC@/$(DEPDIR)/glconfig.Ph@am__quote@@dx_include_marker@
+if AMDEP
+glconfig_nodeps = false
+@am__include@ @am__quote@@GLSRC@/$(DEPDIR)/glconfig.Ph@am__quote@@dx_include_marker@
+else
+glconfig_nodeps = true
+endif
 
 # 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