[lmi-commits] [lmi] master a255c0f 1/2: Expunge a disused makefile variable

[Greg Chicares]

branch: master
commit a255c0f761b3a234fc3807bcad4c9bad4bcf982e
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Expunge a disused makefile variable
    
    Makefile variables named with a 'platform_' prefix are intended to be
    set in platform-specific makefiles included by 'configuration.make'.
    However, 'workhorse.make' has long specified 'platform_wx_libraries'
    in a platform-agnostic manner, and any platform-specific values would
    seem to have been ignored for a very long time, because 'wxmsw25d',
    specified for the builds used in production, is about eleven years old
    (but overridden, of course, by 'workhorse.make').
---
 bcc_5_5_1.make  |    8 --------
 msw_common.make |    4 ----
 posix_fhs.make  |    1 -
 workhorse.make  |    4 +---
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/bcc_5_5_1.make b/bcc_5_5_1.make
index 5bd9800..4e2f516 100644
--- a/bcc_5_5_1.make
+++ b/bcc_5_5_1.make
@@ -119,13 +119,6 @@ LDFLAGS := \
   -L$(bcc_lib_dir) /ap /c /E0 /m /Tpe /V4.0 /w /w-dup /w-dpl \
   --startup-file $(bcc_lib_dir)/c0x32.obj import32.lib cw32i.lib \
 
-# The borland linker fails with this library search path:
-#   /wx-cvs-20050216/wxWidgets/lib/gcc_dll
-# Perhaps it requires an msdos path. Passing an empty variable
-# definition to the main makefile at least allows unit tests to link.
-
-platform_wx_libraries :=
-
 # The borland compiler can't handle the boost filesystem code, but it
 # can limp through some tests by pretending that code doesn't exist.
 
@@ -260,7 +253,6 @@ bcc_5_5_1.make:: ;
                                   CXXFLAGS='$(CXXFLAGS)' \
                                         LD='$(LD)' \
                                    LDFLAGS='$(LDFLAGS)' \
-                     platform_wx_libraries='$(platform_wx_libraries)' \
                   boost_filesystem_objects='$(boost_filesystem_objects)' \
                 excluded_unit_test_targets='$(excluded_unit_test_targets)' \
                                    GNU_CPP='$(GNU_CPP)' \
diff --git a/msw_common.make b/msw_common.make
index 3761dd1..15fb36d 100644
--- a/msw_common.make
+++ b/msw_common.make
@@ -46,10 +46,6 @@ platform_gnome_xml_libraries := \
   -lxslt \
   -lxml2 \
 
-platform_wx_libraries := \
-  -lwx_new \
-  -lwxmsw25d \
-
 # 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 16bba16..5610555 100644
--- a/posix_fhs.make
+++ b/posix_fhs.make
@@ -47,7 +47,6 @@ platform_xmlwrapp_libraries := \
 # non-default wx configuration.
 WXCONFIG := wx-config
 
-platform_wx_libraries := $(shell $(WXCONFIG) --libs)
 wx_cxxflags := $(shell $(WXCONFIG) --cxxflags) -DwxUSE_STD_STRING
 
 AR      := ar
diff --git a/workhorse.make b/workhorse.make
index 9b885f4..6b29553 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -217,8 +217,6 @@ wx_libraries := \
       -e 's/ -[^l][^ ]*//g' \
   )
 
-platform_wx_libraries := $(wx_library_paths) $(wx_libraries)
-
 # Target 'wx_config_check', and the variables that it alone uses,
 # are experimental and may disappear in a future release.
 
@@ -629,7 +627,7 @@ REQUIRED_LIBS := \
   $(platform_gnome_xml_libraries) \
 
 wx_ldflags = \
-  $(platform_wx_libraries) \
+  $(wx_library_paths) $(wx_libraries) \
   $(platform_gui_ldflags) \
 
 wx_pdfdoc_ldflags := \