[lmi-commits] [5864] Rename 'lmi_wx_lib' -> 'skeleton'

[Greg Chicares]

Revision: 5864
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5864
Author:   chicares
Date:     2014-03-06 23:06:19 +0000 (Thu, 06 Mar 2014)
Log Message:
-----------
Rename 'lmi_wx_lib' -> 'skeleton'

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

Modified: lmi/trunk/Makefile.am
===================================================================
--- lmi/trunk/Makefile.am       2014-03-01 14:16:15 UTC (rev 5863)
+++ lmi/trunk/Makefile.am       2014-03-06 23:06:19 UTC (rev 5864)
@@ -63,7 +63,7 @@
 # libtool libraries installed in lib
 lib_LTLIBRARIES = \
     liblmi.la \
-    liblmi_wx_lib.la
+    libskeleton.la
 
 # libtool convenience libraries which are not installed at all
 noinst_LTLIBRARIES = \
@@ -156,7 +156,7 @@
 ##############################################################################
 
 # wx GUI's files are in a library to be shared with the tests
-liblmi_wx_lib_la_SOURCES = \
+libskeleton_la_SOURCES = \
     about_dialog.cpp \
     alert_wx.cpp \
     census_document.cpp \
@@ -206,10 +206,10 @@
 lmi_wx_SOURCES = \
     main_wx.cpp
 
-liblmi_wx_lib_la_CXXFLAGS =
+libskeleton_la_CXXFLAGS =
      $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(XMLWRAPP_CFLAGS) $(GTK_CFLAGS)
 
-liblmi_wx_lib_la_LIBADD = \
+libskeleton_la_LIBADD = \
     liblmi.la \
     libwx_new.la \
     $(XMLWRAPP_LIBS) \
@@ -227,8 +227,8 @@
        $(WINDRES) -I $(top_srcdir) $(WX_CPPFLAGS) $< $@
 endif
 lmi_wx_LDADD = \
-    liblmi_wx_lib.la \
     liblmi.la \
+    libskeleton.la \
     libwx_new.la \
     $(XMLWRAPP_LIBS) \
     $(GTK_LIBS) \
@@ -734,7 +734,7 @@
   main_wx_test.cpp
 test_lmi_wx_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS)
 test_lmi_wx_LDADD = \
-  liblmi_wx_lib.la \
+  libskeleton.la \
   $(WX_LIBS)
 
 test_loads_SOURCES = \
@@ -1216,3 +1216,4 @@
     xml_serialize.hpp \
     yare_input.hpp \
     zero.hpp
+

Modified: lmi/trunk/objects.make
===================================================================
--- lmi/trunk/objects.make      2014-03-01 14:16:15 UTC (rev 5863)
+++ lmi/trunk/objects.make      2014-03-06 23:06:19 UTC (rev 5864)
@@ -296,7 +296,7 @@
   stratified_algorithms.o \
   stratified_charges.o \
 
-lmi_wx_lib_objects := \
+skeleton_objects := \
   $(duplicated_objects) \
   about_dialog.o \
   alert_wx.o \

Modified: lmi/trunk/workhorse.make
===================================================================
--- lmi/trunk/workhorse.make    2014-03-01 14:16:15 UTC (rev 5863)
+++ lmi/trunk/workhorse.make    2014-03-06 23:06:19 UTC (rev 5864)
@@ -97,7 +97,7 @@
   default_targets += \
     lmi_wx_shared$(EXEEXT) \
     lmi_wx_test$(EXEEXT) \
-    lmi_wx_lib_shared$(SHREXT) \
+    skeleton$(SHREXT) \
     wx_new$(SHREXT) \
 
 endif
@@ -825,20 +825,20 @@
 lmi_wx_monolithic$(EXEEXT): EXTRA_LDFLAGS := $(wx_ldflags)
 lmi_wx_monolithic$(EXEEXT): $(lmi_wx_objects) $(lmi_common_objects) 
wx_new$(SHREXT)
 
-lmi_wx_lib_shared$(SHREXT): lmi_so_attributes := -DLMI_USE_SO
-lmi_wx_lib_shared$(SHREXT): EXTRA_LDFLAGS := $(wx_ldflags)
-lmi_wx_lib_shared$(SHREXT): $(lmi_wx_lib_objects) liblmi$(SHREXT) 
wx_new$(SHREXT)
+skeleton$(SHREXT): lmi_so_attributes := -DLMI_USE_SO
+skeleton$(SHREXT): EXTRA_LDFLAGS := $(wx_ldflags)
+skeleton$(SHREXT): $(skeleton_objects) liblmi$(SHREXT) wx_new$(SHREXT)
 
 lmi_wx_shared$(EXEEXT): lmi_so_attributes := -DLMI_USE_SO
 lmi_wx_shared$(EXEEXT): EXTRA_LDFLAGS := $(wx_ldflags)
-lmi_wx_shared$(EXEEXT): $(lmi_wx_objects) lmi_wx_lib_shared$(SHREXT) 
liblmi$(SHREXT) wx_new$(SHREXT)
+lmi_wx_shared$(EXEEXT): $(lmi_wx_objects) skeleton$(SHREXT) liblmi$(SHREXT) 
wx_new$(SHREXT)
 
 lmi_wx_test$(EXEEXT): lmi_so_attributes := -DLMI_USE_SO
 lmi_wx_test$(EXEEXT): EXTRA_LDFLAGS := $(platform_wx_libraries)
-lmi_wx_test$(EXEEXT): $(lmi_wx_test_objects) lmi_wx_lib_shared$(SHREXT) 
liblmi$(SHREXT) wx_new$(SHREXT)
+lmi_wx_test$(EXEEXT): $(lmi_wx_test_objects) skeleton$(SHREXT) liblmi$(SHREXT) 
wx_new$(SHREXT)
 
 lmi_wx_static$(EXEEXT): EXTRA_LDFLAGS := $(wx_ldflags)
-lmi_wx_static$(EXEEXT): $(lmi_wx_objects) $(lmi_wx_lib_objects) liblmi.a 
wx_new$(SHREXT)
+lmi_wx_static$(EXEEXT): $(lmi_wx_objects) $(skeleton_objects) liblmi.a 
wx_new$(SHREXT)
 
 lmi_cli_monolithic$(EXEEXT): $(cli_objects) $(lmi_common_objects)