[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master e751efea 6/7: Group $(XMLLINT) with other 'ma
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master e751efea 6/7: Group $(XMLLINT) with other 'make' aliases |
Date: |
Thu, 23 Jun 2022 07:44:18 -0400 (EDT) |
branch: master
commit e751efea40dc99447ccba7fe09d1ebdf1fc67777
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Group $(XMLLINT) with other 'make' aliases
---
msw_cygwin.make | 14 +++++++-------
msw_generic.make | 18 +++++++++---------
msw_wsl.make | 14 +++++++-------
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/msw_cygwin.make b/msw_cygwin.make
index 45b4d03d..c41f3c9e 100644
--- a/msw_cygwin.make
+++ b/msw_cygwin.make
@@ -72,6 +72,13 @@ CXX := $(gcc_bin_dir)$(host_hyphen)g++
LD := $(gcc_bin_dir)$(host_hyphen)g++
RC := $(gcc_bin_dir)$(host_hyphen)windres
+# Programs for which FHS doesn't specify a location.
+
+# The 'xmllint' lmi builds matches the libxml2 version lmi uses:
+ XMLLINT := $(localbindir)/xmllint
+# while the build system's own 'xmllint', if installed, may differ:
+# XMLLINT := xmllint
+
# Identify run-time libraries for redistribution. See:
# https://cygwin.com/ml/cygwin/2010-09/msg00553.html
# Of course manipulating an lmi user's $PATH is out of the question.
@@ -82,13 +89,6 @@ compiler_runtime_files := \
$(wildcard $(compiler_sysroot)/libgcc*.dll) \
$(wildcard $(compiler_sysroot)/libstdc++*.dll) \
-# Programs for which FHS doesn't specify a location.
-
-# The 'xmllint' lmi builds matches the libxml2 version lmi uses:
- XMLLINT := $(localbindir)/xmllint
-# while the build system's own 'xmllint', if installed, may differ:
-# XMLLINT := xmllint
-
################################################################################
# Configuration shared by all msw subplatforms.
diff --git a/msw_generic.make b/msw_generic.make
index fce23f0f..7967d6f7 100644
--- a/msw_generic.make
+++ b/msw_generic.make
@@ -45,6 +45,15 @@ CXX := $(gcc_bin_dir)$(host_hyphen)g++
LD := $(gcc_bin_dir)$(host_hyphen)g++
RC := $(gcc_bin_dir)$(host_hyphen)windres
+# Programs for which FHS doesn't specify a location.
+
+# The 'xmllint' lmi builds matches the libxml2 version lmi uses:
+# XMLLINT := $(PERFORM) $(localbindir)/xmllint$(EXEEXT)
+# while the build system's own 'xmllint', if installed, may differ:
+ XMLLINT := xmllint
+# Don't use the one lmi builds until 'wine' is fixed--see:
+# https://lists.nongnu.org/archive/html/lmi/2019-01/msg00034.html
+
# Identify run-time libraries for redistribution. See:
# https://lists.nongnu.org/archive/html/lmi/2017-05/msg00046.html
# Perhaps gcc's '-print-sysroot' would be more suitable, but that
@@ -62,15 +71,6 @@ compiler_runtime_files := \
$(wildcard $(compiler_sysroot)/libgcc*.dll) \
$(wildcard $(compiler_sysroot)/libstdc++*.dll) \
-# Programs for which FHS doesn't specify a location.
-
-# The 'xmllint' lmi builds matches the libxml2 version lmi uses:
-# XMLLINT := $(PERFORM) $(localbindir)/xmllint$(EXEEXT)
-# while the build system's own 'xmllint', if installed, may differ:
- XMLLINT := xmllint
-# Don't use the one lmi builds until 'wine' is fixed--see:
-# https://lists.nongnu.org/archive/html/lmi/2019-01/msg00034.html
-
################################################################################
# Configuration shared by all msw subplatforms.
diff --git a/msw_wsl.make b/msw_wsl.make
index 34f88d95..71e2e226 100644
--- a/msw_wsl.make
+++ b/msw_wsl.make
@@ -45,6 +45,13 @@ CXX := $(gcc_bin_dir)$(host_hyphen)g++
LD := $(gcc_bin_dir)$(host_hyphen)g++
RC := $(gcc_bin_dir)$(host_hyphen)windres
+# Programs for which FHS doesn't specify a location.
+
+# The 'xmllint' lmi builds matches the libxml2 version lmi uses:
+ XMLLINT := $(localbindir)/xmllint$(EXEEXT)
+# while the build system's own 'xmllint', if installed, may differ:
+# XMLLINT := xmllint
+
# Identify run-time libraries for redistribution. See:
# https://lists.nongnu.org/archive/html/lmi/2017-05/msg00046.html
# Perhaps gcc's '-print-sysroot' would be more suitable, but that
@@ -62,13 +69,6 @@ compiler_runtime_files := \
$(wildcard $(compiler_sysroot)/libgcc*.dll) \
$(wildcard $(compiler_sysroot)/libstdc++*.dll) \
-# Programs for which FHS doesn't specify a location.
-
-# The 'xmllint' lmi builds matches the libxml2 version lmi uses:
- XMLLINT := $(localbindir)/xmllint$(EXEEXT)
-# while the build system's own 'xmllint', if installed, may differ:
-# XMLLINT := xmllint
-
################################################################################
# Configuration shared by all msw subplatforms.
- [lmi-commits] [lmi] master updated (ade66891 -> adc56d25), Greg Chicares, 2022/06/23
- [lmi-commits] [lmi] master 6ac1e493 2/7: Remove disused 'system_root', Greg Chicares, 2022/06/23
- [lmi-commits] [lmi] master 3ce05e8b 5/7: Regularize definition of $(XMLLINT) as much as possible, Greg Chicares, 2022/06/23
- [lmi-commits] [lmi] master 683b5daf 3/7: Deduplicate, Greg Chicares, 2022/06/23
- [lmi-commits] [lmi] master adc56d25 7/7: Factor out gcc specifics, Greg Chicares, 2022/06/23
- [lmi-commits] [lmi] master e751efea 6/7: Group $(XMLLINT) with other 'make' aliases,
Greg Chicares <=
- [lmi-commits] [lmi] master fb5250e3 1/7: Remove disused 'cgi_bin_dir', Greg Chicares, 2022/06/23
- [lmi-commits] [lmi] master d81eecc7 4/7: Prefer $(EXEEXT) to literal ".exe" in makefile, Greg Chicares, 2022/06/23