[lmi-commits] [lmi] master cb7f345f 11/13: Assert that there is OAOO $(build_type)

[Greg Chicares]

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

    Assert that there is OAOO $(build_type)
    
    Build type must be a single word because it determines the build
    directory. Asserted that, and nullified a confused conditional that
    assumed otherwise.
---
 workhorse.make | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/workhorse.make b/workhorse.make
index f7f6e822..0d7a291e 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -79,6 +79,10 @@ $(srcdir)/objects.make:: ;
 
 
################################################################################
 
+ifneq (1,$(words $(build_type)))
+    $(error There must be exactly one build_type, not "$(build_type)")
+endif
+
 ifeq (so_test,$(findstring so_test,$(build_type)))
   USE_SO_ATTRIBUTES=1
 endif
@@ -153,12 +157,8 @@ ifneq (safestdlib,$(findstring safestdlib,$(build_type)))
     lmi_wx_shared$(EXEEXT) \
     skeleton$(SHREXT) \
     wx_new$(SHREXT) \
+    wx_test$(EXEEXT) \
 
-  ifneq (so_test,$(findstring so_test,$(build_type)))
-    default_targets += \
-      wx_test$(EXEEXT) \
-
-  endif
 endif
 
 default_targets := \