[openrtm-commit:03146] r3205 - branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2018-01-25 08:24:08 +0900 (Thu, 25 Jan 2018)
New Revision: 3205

Modified:
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/FactoryInit.cpp
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am
Log:
[compat,build,->trunk] SDO module ComponentObserverConsumer is now build-in to the libRTC.so in default refs #4434

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/FactoryInit.cpp
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/FactoryInit.cpp	2018-01-24 23:04:13 UTC (rev 3204)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/FactoryInit.cpp	2018-01-24 23:24:08 UTC (rev 3205)
@@ -49,6 +49,10 @@
 #include <rtm/NamingServiceNumberingPolicy.h>
 #include <rtm/NodeNumberingPolicy.h>
 
+#ifdef ENABLE_OBSERVER
+#include <ext/sdo/observer/ComponentObserverConsumer.h>
+#endif
+
 void FactoryInit()
 {
     // Logstream
@@ -83,4 +87,9 @@
     ProcessUniquePolicyInit();
 	NamingServiceNumberingPolicyInit();
 	NodeNumberingPolicyInit();
+
+    // SDO services
+#ifdef ENABLE_OBSERVER
+    ComponentObserverConsumerInit();
+#endif
 }

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am	2018-01-24 23:04:13 UTC (rev 3204)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am	2018-01-24 23:24:08 UTC (rev 3205)
@@ -10,7 +10,7 @@
 ARTLIB = @ARTLIB@
 SUBDIRS = idl . ext @UNITTEST@
 
-AM_CPPFLAGS=-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/coil/include -I$(top_srcdir)/src/lib/rtm -I$(top_srcdir)/src/lib/rtm/idl
+AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/coil/include -I$(top_srcdir)/src/lib/rtm -I$(top_srcdir)/src/lib/rtm/idl
 AM_LDFLAGS=-L$(top_builddir) -L$(top_builddir)/src/lib/rtm -L$(top_builddir)/src/lib/rtm/idl -L$(top_builddir)/src/lib/coil/lib
 
 # version.h would be generated from configure before lib build process.
@@ -139,16 +139,35 @@
 	version.txt \
 	$(UTIL_SRC) $(MGR_SRC) $(COMP_SRC) $(PORT_SRC)
 
+#------------------------------
+# Component observer embedded
+if ENABLE_OBSERVER
+OBSERVER_LA = \
+	libComponentObserverStub.la \
+	libComponentObserverConsumer.la
+OBSERVER_LIB = \
+	$(top_builddir)/src/ext/sdo/observer/libComponentObserverStub.la \
+	$(top_builddir)/src/ext/sdo/observer/libComponentObserverConsumer.la
+OBSERVER_LDFLAGS = -L$(top_builddir)/src/ext/sdo/observer
+endif
+libComponentObserverStub.la:
+	(cd $(top_builddir)/src/ext/sdo/observer ; make)
+libComponentObserverConsumer.la: libComponentObserverStub.la
+	(cd $(top_builddir)/src/ext/sdo/observer ; make)
+#------------------------------
 
 libRTC_la_LIBADD = \
 	$(top_builddir)/src/lib/coil/lib/libcoil.la \
-	$(top_builddir)/src/lib/rtm/idl/libRTCSkel.la
+	$(top_builddir)/src/lib/rtm/idl/libRTCSkel.la \
+	$(OBSERVER_LIB)
 
-# $(top_builddir)/rtm/idl/libRTCStub.la $(ARTLIB)
-libRTC_la_LDFLAGS =                 \
-	-no-undefined               \
-	-L$(top_builddir)/src/lib/rtm/idl   \
-	-release $(PACKAGE_VERSION)
+libRTC_la_DEPENDENCIES = \
+	$(OBSERVER_LA)
+libRTC_la_LDFLAGS =                   \
+	-no-undefined                     \
+	-L$(top_builddir)/src/lib/rtm/idl \
+	-release $(PACKAGE_VERSION)       \
+	$(OBSERVER_LDFLAGS)
 
 
 rtmheaderdir = $(rtm_includedir)/rtm