[openrtm-commit:00512] r2249 - tags/RELEASE_1_0_1/OpenRTM-aist/src/lib/rtm

openrtm @ openrtm.org openrtm @ openrtm.org
2011年 12月 22日 (木) 15:25:21 JST


Author: n-ando
Date: 2011-12-22 15:25:21 +0900 (Thu, 22 Dec 2011)
New Revision: 2249

Modified:
   tags/RELEASE_1_0_1/OpenRTM-aist/src/lib/rtm/Makefile.am
   tags/RELEASE_1_0_1/OpenRTM-aist/src/lib/rtm/Manager.cpp
Log:
libRTC-1.0.1 was linked to libRTC-1.0.0

Modified: tags/RELEASE_1_0_1/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- tags/RELEASE_1_0_1/OpenRTM-aist/src/lib/rtm/Makefile.am	2011-12-21 01:11:43 UTC (rev 2248)
+++ tags/RELEASE_1_0_1/OpenRTM-aist/src/lib/rtm/Makefile.am	2011-12-22 06:25:21 UTC (rev 2249)
@@ -108,6 +108,9 @@
 	-release $(PACKAGE_VERSION) \
 	-version-info 0:4:0
 
+install-exec-hook:
+	ln -s $(DESTDIR)$(libdir)/libRTC-1.0.1.so.0  $(DESTDIR)$(libdir)/libRTC-1.0.0.so.0
+	ln -s $(DESTDIR)$(libdir)/libRTC-1.0.1.so.0  $(DESTDIR)$(libdir)/libRTC-1.0.so.0
 
 rtmheaderdir = $(prefix)/include/rtm
 

Modified: tags/RELEASE_1_0_1/OpenRTM-aist/src/lib/rtm/Manager.cpp
===================================================================
--- tags/RELEASE_1_0_1/OpenRTM-aist/src/lib/rtm/Manager.cpp	2011-12-21 01:11:43 UTC (rev 2248)
+++ tags/RELEASE_1_0_1/OpenRTM-aist/src/lib/rtm/Manager.cpp	2011-12-22 06:25:21 UTC (rev 2249)
@@ -77,7 +77,7 @@
    * @endif
    */
   Manager::Manager()
-    : m_initProc(NULL),
+    : m_initProc(NULL), m_namingManager(NULL), m_timer(NULL),
       m_logStreamBuf(), rtclog(&m_logStreamBuf),
       m_runner(NULL), m_terminator(NULL)
   {
@@ -92,7 +92,7 @@
    * @endif
    */
   Manager::Manager(const Manager& manager)
-    : m_initProc(NULL),
+    : m_initProc(NULL), m_namingManager(NULL), m_timer(NULL),
       m_logStreamBuf(), rtclog(&m_logStreamBuf),
       m_runner(NULL), m_terminator(NULL)
   {



openrtm-commit メーリングリストの案内