[lmi-commits] [lmi] master a2d6b2ac 12/13: Migrate one last conditional

[Greg Chicares]

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

    Migrate one last conditional
---
 workhorse.make | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/workhorse.make b/workhorse.make
index 0d7a291e..60103e42 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -129,6 +129,18 @@ ifdef USE_SO_ATTRIBUTES
 
 endif
 
+# For targets that depend on wx, build type 'safestdlib' requires a
+# compatible wx build, which is not yet available.
+
+ifeq (safestdlib,$(findstring safestdlib,$(build_type)))
+  excluded_default_targets += \
+    lmi_wx_shared$(EXEEXT) \
+    skeleton$(SHREXT) \
+    wx_new$(SHREXT) \
+    wx_test$(EXEEXT) \
+
+endif
+
 # Effective default target (described above under "Default target").
 
 default_targets := \
@@ -145,21 +157,13 @@ default_targets := \
   liblmi$(SHREXT) \
   lmi_cli_shared$(EXEEXT) \
   lmi_md5sum$(EXEEXT) \
+  lmi_wx_shared$(EXEEXT) \
   product_files$(EXEEXT) \
   rate_table_tool$(EXEEXT) \
+  skeleton$(SHREXT) \
   test_coding_rules$(EXEEXT) \
-
-# For targets that depend on wx, build type 'safestdlib' requires a
-# compatible wx build, which is not yet available.
-
-ifneq (safestdlib,$(findstring safestdlib,$(build_type)))
-  default_targets += \
-    lmi_wx_shared$(EXEEXT) \
-    skeleton$(SHREXT) \
-    wx_new$(SHREXT) \
-    wx_test$(EXEEXT) \
-
-endif
+  wx_new$(SHREXT) \
+  wx_test$(EXEEXT) \
 
 default_targets := \
   $(filter-out $(excluded_default_targets), $(default_targets) \