[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 44db896 2/5: Set 'platform_xml_libraries' uni
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 44db896 2/5: Set 'platform_xml_libraries' uniformly |
Date: |
Tue, 13 Oct 2020 18:17:09 -0400 (EDT) |
branch: master
commit 44db89608795c426b028597a6d40497d82ae95e4
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Set 'platform_xml_libraries' uniformly
Moved the 'posix_fhs.make' definition to 'configuration.make', and
removed the different but equivalent definition from 'msw_common.make'.
See:
https://lists.nongnu.org/archive/html/lmi/2020-10/msg00052.html
---
configuration.make | 15 +++++++++++++++
msw_common.make | 7 -------
posix_fhs.make | 11 -----------
3 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/configuration.make b/configuration.make
index b4f92d1..3119543 100644
--- a/configuration.make
+++ b/configuration.make
@@ -47,6 +47,21 @@ $(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
+
+platform_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/msw_common.make b/msw_common.make
index e6dd1a2..bfaa9dd 100644
--- a/msw_common.make
+++ b/msw_common.make
@@ -42,13 +42,6 @@ platform_defines := \
platform_gui_ldflags := -mwindows
-platform_xml_libraries := \
- -lxsltwrapp \
- -lxmlwrapp \
- -lexslt \
- -lxslt \
- -lxml2 \
-
# In addition to other reasons for treating these libraries as mere
# collections of source files, there's a specific problem with boost.
# The build system provided by boost produces library names such as
diff --git a/posix_fhs.make b/posix_fhs.make
index 284ab30..bd1df19 100644
--- a/posix_fhs.make
+++ b/posix_fhs.make
@@ -35,17 +35,6 @@ platform_boost_libraries := \
# necessary because lmi compiles their source code to object files.
platform_boost_libraries :=
-# 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
-
-platform_xml_libraries := \
- $(shell xmlwrapp-config --libs) \
- -lexslt \
- $(shell xslt-config --libs) \
- $(shell xml2-config --libs) \
-
AR := ar
CC := gcc
CPP := cpp