[lmi-commits] [lmi] master a9f709d 4/5: Invoke all *-config scripts together in the right place

[Greg Chicares]

branch: master
commit a9f709d3e3616c6994654eec700ed92663100197
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Invoke all *-config scripts together in the right place
    
    The right place to do this is 'workhorse.make'. That's where 'wx-config'
    has always been invoked. With 'xmlwrapp-config' in 'configuration.make',
    this message appeared at the top of any 'make' run:
      make: xmlwrapp-config: No such file or directory
    but with it in 'workhorse.make', that no longer occurs. Explanation:
    'configuration.make' in included by 'GNUmakefile', before it sets $PATH,
    but *-config scripts are architecture-dependent and $PATH is required to
    choose which one to invoke. On the other hand, 'GNUmakefile' does not
    include 'workhorse.make', but rather invokes it in a recursive 'make'
    command, passing it the appropriate $PATH for the chosen architecture.
---
 configuration.make | 15 ---------------
 workhorse.make     | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/configuration.make b/configuration.make
index 3452ddf..b4f92d1 100644
--- a/configuration.make
+++ b/configuration.make
@@ -47,21 +47,6 @@ $(srcdir)/$(platform_makefile):: ;
 
 
################################################################################
 
-# Generic settings.
-
-# Flags for all other xml libraries are provided by *-config scripts,
-# but '-lexslt' is a special case--see:
-#   https://mail.gnome.org/archives/xslt/2001-October/msg00133.html
-#   https://lists.nongnu.org/archive/html/lmi/2020-10/msg00066.html
-
-xml_libraries := \
-  $(shell xmlwrapp-config --libs) \
-  -lexslt \
-  $(shell xslt-config --libs) \
-  $(shell xml2-config --libs) \
-
-################################################################################
-
 # GNU tools for special purposes.
 
 # Always use the GNU C++ compiler and preprocessor, version 3.x or
diff --git a/workhorse.make b/workhorse.make
index 2518356..8597d25 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -186,6 +186,21 @@ endif
 
 
################################################################################
 
+# xml library settings.
+
+# Flags for all other xml libraries are provided by *-config scripts,
+# but '-lexslt' is a special case--see:
+#   https://mail.gnome.org/archives/xslt/2001-October/msg00133.html
+#   https://lists.nongnu.org/archive/html/lmi/2020-10/msg00066.html
+
+xml_libraries := \
+  $(shell xmlwrapp-config --libs) \
+  -lexslt \
+  $(shell xslt-config --libs) \
+  $(shell xml2-config --libs) \
+
+################################################################################
+
 # wx settings.
 
 wx_dir := $(localbindir)