[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 04883bb 4/5: Specify $(xml_ldflags) exactly w
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 04883bb 4/5: Specify $(xml_ldflags) exactly where required |
Date: |
Thu, 30 Sep 2021 20:43:51 -0400 (EDT) |
branch: master
commit 04883bb3ba646bfeee3bf9fc82580f723c5fca46
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Specify $(xml_ldflags) exactly where required
This is better than incorporating it into $(REQUIRED_LIBS), which will
soon be eradicated because it was a bad idea.
Reason for recursive rather than simple assignment in 'objects.make':
https://lists.nongnu.org/archive/html/lmi/2021-09/msg00012.html
---
objects.make | 9 +++++++++
workhorse.make | 14 +++++++++++---
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/objects.make b/objects.make
index 6f5bd85..b17a036 100644
--- a/objects.make
+++ b/objects.make
@@ -487,6 +487,7 @@ account_value_test$(EXEEXT): \
$(common_test_objects) \
account_value_test.o \
+actuarial_table_test$(EXEEXT): EXTRA_LDFLAGS = $(xml_ldflags)
actuarial_table_test$(EXEEXT): \
$(common_test_objects) \
actuarial_table.o \
@@ -561,6 +562,7 @@ commutation_functions_test$(EXEEXT): \
cso_table.o \
timer.o \
+configurable_settings_test$(EXEEXT): EXTRA_LDFLAGS = $(xml_ldflags)
configurable_settings_test$(EXEEXT): \
$(common_test_objects) \
calendar_date.o \
@@ -691,6 +693,7 @@ input_sequence_test$(EXEEXT): \
null_stream.o \
path_utility.o \
+input_test$(EXEEXT): EXTRA_LDFLAGS = $(xml_ldflags)
input_test$(EXEEXT): \
$(common_test_objects) \
calendar_date.o \
@@ -751,6 +754,7 @@ irc7702_tables_test$(EXEEXT): \
null_stream.o \
path_utility.o \
+irc7702a_test$(EXEEXT): EXTRA_LDFLAGS = $(xml_ldflags)
irc7702a_test$(EXEEXT): \
$(common_test_objects) \
calendar_date.o \
@@ -769,6 +773,7 @@ istream_to_string_test$(EXEEXT): \
istream_to_string_test.o \
timer.o \
+ledger_test$(EXEEXT): EXTRA_LDFLAGS = $(xml_ldflags)
ledger_test$(EXEEXT): \
$(common_test_objects) \
calendar_date.o \
@@ -888,6 +893,7 @@ path_utility_test$(EXEEXT): \
path_utility_test.o \
wine_workarounds.o \
+premium_tax_test$(EXEEXT): EXTRA_LDFLAGS = $(xml_ldflags)
premium_tax_test$(EXEEXT): \
$(common_test_objects) \
calendar_date.o \
@@ -923,6 +929,7 @@ print_matrix_test$(EXEEXT): \
path_utility.o \
print_matrix_test.o \
+product_file_test$(EXEEXT): EXTRA_LDFLAGS = $(xml_ldflags)
product_file_test$(EXEEXT): \
$(common_test_objects) \
calendar_date.o \
@@ -1067,6 +1074,7 @@ wx_new_test$(EXEEXT): \
$(common_test_objects) \
wx_new_test.o \
+xml_serialize_test$(EXEEXT): EXTRA_LDFLAGS = $(xml_ldflags)
xml_serialize_test$(EXEEXT): \
$(common_test_objects) \
calendar_date.o \
@@ -1190,6 +1198,7 @@ bcc_rc$(EXEEXT): \
# variable definitions here. If that works well, use the technique
# elsewhere.
+product_files$(EXEEXT): EXTRA_LDFLAGS = $(xml_ldflags)
product_files$(EXEEXT): \
alert_cli.o \
generate_product_files.o \
diff --git a/workhorse.make b/workhorse.make
index 2c31e14..bccbecc 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -772,7 +772,6 @@ $(product_file_sources): tutelary_flag +=
$(product_file_flags)
# http://boost.org/more/faq.htm
REQUIRED_LIBS := \
- $(xml_ldflags) \
################################################################################
@@ -1001,8 +1000,10 @@ wx_new$(SHREXT) : EXTRA_LDFLAGS :=
lmi_wx_new_so_attributes := -DLMI_WX_NEW_USE_SO
wx_new$(SHREXT) : lmi_wx_new_so_attributes := -DLMI_WX_NEW_BUILD_SO
-liblmi.a liblmi$(SHREXT): EXTRA_LDFLAGS :=
+liblmi.a liblmi$(SHREXT): EXTRA_LDFLAGS := $(xml_ldflags)
liblmi.a liblmi$(SHREXT): $(lmi_common_objects)
+
+libantediluvian.a libantediluvian$(SHREXT): EXTRA_LDFLAGS := $(xml_ldflags)
libantediluvian.a libantediluvian$(SHREXT): $(antediluvian_common_objects)
# TODO ?? 'lmi*' targets can be built either with a shared or a static
@@ -1016,7 +1017,7 @@ lmi_wx_monolithic$(EXEEXT): $(lmi_wx_objects)
$(lmi_common_objects) wx_new$(SHRE
# source files that are unrelated to wx, and that are therefore not
# part of $(skeleton_objects).
skeleton$(SHREXT): lmi_so_attributes := -DLMI_USE_SO
-skeleton$(SHREXT): EXTRA_LDFLAGS := $(wx_pdfdoc_ldflags) $(wx_ldflags)
+skeleton$(SHREXT): EXTRA_LDFLAGS := $(wx_pdfdoc_ldflags) $(wx_ldflags)
$(xml_ldflags)
skeleton$(SHREXT): $(skeleton_objects) liblmi$(SHREXT) wx_new$(SHREXT)
lmi_wx_shared$(EXEEXT): lmi_so_attributes := -DLMI_USE_SO
@@ -1026,19 +1027,25 @@ lmi_wx_shared$(EXEEXT): $(lmi_wx_objects)
skeleton$(SHREXT) liblmi$(SHREXT)
lmi_wx_static$(EXEEXT): EXTRA_LDFLAGS := $(wx_ldflags)
lmi_wx_static$(EXEEXT): $(lmi_wx_objects) $(skeleton_objects) liblmi.a
wx_new$(SHREXT)
+lmi_cli_monolithic$(EXEEXT): EXTRA_LDFLAGS := $(xml_ldflags)
lmi_cli_monolithic$(EXEEXT): $(cli_objects) $(lmi_common_objects)
+lmi_cli_shared$(EXEEXT): EXTRA_LDFLAGS := $(xml_ldflags)
lmi_cli_shared$(EXEEXT): lmi_so_attributes := -DLMI_USE_SO
lmi_cli_shared$(EXEEXT): $(cli_objects) liblmi$(SHREXT)
+lmi_cli_static$(EXEEXT): EXTRA_LDFLAGS := $(xml_ldflags)
lmi_cli_static$(EXEEXT): $(cli_objects) liblmi.a
+antediluvian_cgi$(EXEEXT): EXTRA_LDFLAGS := $(xml_ldflags)
antediluvian_cgi$(EXEEXT): lmi_so_attributes := -DLMI_USE_SO
antediluvian_cgi$(EXEEXT): $(cgi_objects) libantediluvian$(SHREXT)
+antediluvian_cli$(EXEEXT): EXTRA_LDFLAGS := $(xml_ldflags)
antediluvian_cli$(EXEEXT): lmi_so_attributes := -DLMI_USE_SO
antediluvian_cli$(EXEEXT): $(cli_objects) libantediluvian$(SHREXT)
+antediluvian_cli_monolithic$(EXEEXT): EXTRA_LDFLAGS := $(xml_ldflags)
antediluvian_cli_monolithic$(EXEEXT): $(cli_objects)
$(antediluvian_common_objects)
wx_new$(SHREXT): wx_new.o
@@ -1048,6 +1055,7 @@ wx_test$(EXEEXT): EXTRA_LDFLAGS := $(wx_ldflags)
wx_test$(EXEEXT): $(wx_test_objects) skeleton$(SHREXT) liblmi$(SHREXT)
# TODO ?? This needs a corresponding test target.
+lmi_cgi$(EXEEXT): EXTRA_LDFLAGS := $(xml_ldflags)
lmi_cgi$(EXEEXT): $(cgi_objects) $(lmi_common_objects)
lmi_msw_res.o: lmi.ico
- [lmi-commits] [lmi] master updated (0e2fd3b -> d2dd934), Greg Chicares, 2021/09/30
- [lmi-commits] [lmi] master 008477a 3/5: Rename a makefile variable, for concinnity, Greg Chicares, 2021/09/30
- [lmi-commits] [lmi] master d2dd934 5/5: Expunge $(REQUIRED_LIBS) [275], Greg Chicares, 2021/09/30
- [lmi-commits] [lmi] master 04883bb 4/5: Specify $(xml_ldflags) exactly where required,
Greg Chicares <=
- [lmi-commits] [lmi] master 2a768f8 2/5: Rearrange certain linker flags, Greg Chicares, 2021/09/30
- [lmi-commits] [lmi] master 0422450 1/5: Augment 'make show_flags', Greg Chicares, 2021/09/30