[openrtm-commit:03145] r3204 - branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2018-01-25 08:04:13 +0900 (Thu, 25 Jan 2018)
New Revision: 3204

Modified:
   branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
Log:
[compat,build,->trunk] ENABLE_OBSERVER flag makes building the module as a static library. refs #4434

Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am	2018-01-24 22:57:34 UTC (rev 3203)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am	2018-01-24 23:04:13 UTC (rev 3204)
@@ -70,6 +70,23 @@
 # Targets directories
 socompdir = $(rtm_sdodir)
 
+#------------------------------
+# Static link library for linked in libRTC.so
+if ENABLE_OBSERVER
+noinst_LTLIBRARIES = \
+	libComponentObserverStub.la \
+	libComponentObserverConsumer.la
+nodist_libComponentObserverStub_la_SOURCES =  $(IDL_SOURCES:.idl=Stub.cpp)
+
+nodist_libComponentObserverConsumer_la_SOURCES = \
+	$(OBSERVER_DIST_SRC) $(OBSERVER_DIST_H)
+nodist_libComponentObserverConsumer_la_LDFLAGS = -module
+nodist_libComponentObserverConsumer_la_DEPENDENCIES = \
+	libComponentObserverStub.la
+nodist_libComponentObserverConsumer_la_LIBADD  =      \
+	libComponentObserverStub.la
+else
+#------------------------------
 # Loadable Module
 noinst_LTLIBRARIES = libComponentObserverStub.la
 nodist_libComponentObserverStub_la_SOURCES =  $(IDL_SOURCES:.idl=Stub.cpp)
@@ -81,9 +98,11 @@
 ComponentObserverConsumer_la_LDFLAGS = -module
 ComponentObserverConsumer_la_DEPENDENCIES = libComponentObserverStub.la
 ComponentObserverConsumer_la_LIBADD  =                \
-	libComponentObserverStub.la                   \
+	libComponentObserverStub.la                   
 	$(top_builddir)/src/lib/rtm/libRTC.la         \
 	$(top_builddir)/src/lib/coil/lib/libcoil.la
+endif
+#------------------------------
 
 #------------------------------------------------------------
 # Extra distributed files