[lmi-commits] [lmi] master 3b1b8a3d 10/13: Migrate another conditional

[Greg Chicares]

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

    Migrate another conditional
---
 workhorse.make | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/workhorse.make b/workhorse.make
index f1b6fa30..f7f6e822 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -111,7 +111,16 @@ endif
 
 ifdef USE_SO_ATTRIBUTES
   excluded_default_targets += \
+    bcc_ar$(EXEEXT) \
+    bcc_cc$(EXEEXT) \
+    bcc_ld$(EXEEXT) \
+    bcc_rc$(EXEEXT) \
+    elapsed_time$(EXEEXT) \
+    generate_passkey$(EXEEXT) \
+    ihs_crc_comp$(EXEEXT) \
+    lmi_md5sum$(EXEEXT) \
     product_files$(EXEEXT) \
+    rate_table_tool$(EXEEXT) \
     test_coding_rules$(EXEEXT) \
 
 endif
@@ -121,10 +130,19 @@ endif
 default_targets := \
   antediluvian_cgi$(EXEEXT) \
   antediluvian_cli$(EXEEXT) \
+  bcc_ar$(EXEEXT) \
+  bcc_cc$(EXEEXT) \
+  bcc_ld$(EXEEXT) \
+  bcc_rc$(EXEEXT) \
+  elapsed_time$(EXEEXT) \
+  generate_passkey$(EXEEXT) \
+  ihs_crc_comp$(EXEEXT) \
   libantediluvian$(SHREXT) \
   liblmi$(SHREXT) \
   lmi_cli_shared$(EXEEXT) \
+  lmi_md5sum$(EXEEXT) \
   product_files$(EXEEXT) \
+  rate_table_tool$(EXEEXT) \
   test_coding_rules$(EXEEXT) \
 
 # For targets that depend on wx, build type 'safestdlib' requires a
@@ -143,20 +161,6 @@ ifneq (safestdlib,$(findstring safestdlib,$(build_type)))
   endif
 endif
 
-ifeq (,$(USE_SO_ATTRIBUTES))
-  default_targets += \
-    bcc_ar$(EXEEXT) \
-    bcc_cc$(EXEEXT) \
-    bcc_ld$(EXEEXT) \
-    bcc_rc$(EXEEXT) \
-    elapsed_time$(EXEEXT) \
-    generate_passkey$(EXEEXT) \
-    ihs_crc_comp$(EXEEXT) \
-    lmi_md5sum$(EXEEXT) \
-    rate_table_tool$(EXEEXT) \
-
-endif
-
 default_targets := \
   $(filter-out $(excluded_default_targets), $(default_targets) \
   ) \