[lmi-commits] [5869] Rename 'lmi_wx_test' -> 'wx_test'

[Greg Chicares]

Revision: 5869
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5869
Author:   chicares
Date:     2014-03-07 13:55:24 +0000 (Fri, 07 Mar 2014)
Log Message:
-----------
Rename 'lmi_wx_test' -> 'wx_test'

Modified Paths:
--------------
    lmi/trunk/objects.make
    lmi/trunk/workhorse.make

Modified: lmi/trunk/objects.make
===================================================================
--- lmi/trunk/objects.make      2014-03-07 13:41:15 UTC (rev 5868)
+++ lmi/trunk/objects.make      2014-03-07 13:55:24 UTC (rev 5869)
@@ -346,12 +346,12 @@
 lmi_wx_objects := \
   main_wx.o \
 
-lmi_wx_test_objects := \
+wx_test_objects := \
   main_wx_test.o \
 
 ifneq (,$(RC))
-  lmi_wx_objects += lmi_msw_res.o
-  lmi_wx_test_objects += lmi_msw_res.o
+  lmi_wx_objects  += lmi_msw_res.o
+  wx_test_objects += lmi_msw_res.o
 endif
 
 
################################################################################

Modified: lmi/trunk/workhorse.make
===================================================================
--- lmi/trunk/workhorse.make    2014-03-07 13:41:15 UTC (rev 5868)
+++ lmi/trunk/workhorse.make    2014-03-07 13:55:24 UTC (rev 5869)
@@ -96,9 +96,9 @@
 ifneq (safestdlib,$(findstring safestdlib,$(build_type)))
   default_targets += \
     lmi_wx_shared$(EXEEXT) \
-    lmi_wx_test$(EXEEXT) \
     skeleton$(SHREXT) \
     wx_new$(SHREXT) \
+    wx_test$(EXEEXT) \
 
 endif
 
@@ -837,10 +837,6 @@
 lmi_wx_shared$(EXEEXT): EXTRA_LDFLAGS := $(wx_ldflags)
 lmi_wx_shared$(EXEEXT): $(lmi_wx_objects) skeleton$(SHREXT) liblmi$(SHREXT)
 
-lmi_wx_test$(EXEEXT): lmi_so_attributes := -DLMI_USE_SO
-lmi_wx_test$(EXEEXT): EXTRA_LDFLAGS := $(wx_ldflags)
-lmi_wx_test$(EXEEXT): $(lmi_wx_test_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)
 
@@ -861,6 +857,10 @@
 
 wx_new$(SHREXT): wx_new.o
 
+wx_test$(EXEEXT): lmi_so_attributes := -DLMI_USE_SO
+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): $(cgi_objects) $(lmi_common_objects)