[openrtm-commit:03178] r3224 - in branches/RELENG_1_2/OpenRTM-aist/src: ext/sdo/observer lib/rtm
openrtm @ openrtm.org
openrtm @ openrtm.org
2018年 2月 21日 (水) 03:47:24 JST
Author: n-ando
Date: 2018-02-21 03:47:24 +0900 (Wed, 21 Feb 2018)
New Revision: 3224
Modified:
branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am
Log:
[build,bugfix,->trunk] Build bug fixed.
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-02-20 10:44:42 UTC (rev 3223)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2018-02-20 18:47:24 UTC (rev 3224)
@@ -73,7 +73,7 @@
#------------------------------
# Static link library for linked in libRTC.so
if ENABLE_OBSERVER
-noinst_LTLIBRARIES = \
+noinst_LTLIBRARIES = \
libComponentObserverStub.la \
libComponentObserverConsumer.la
nodist_libComponentObserverStub_la_SOURCES = $(IDL_SOURCES:.idl=Stub.cpp)
@@ -97,8 +97,8 @@
$(OBSERVER_DIST_SRC) $(OBSERVER_DIST_H)
ComponentObserverConsumer_la_LDFLAGS = -module
ComponentObserverConsumer_la_DEPENDENCIES = libComponentObserverStub.la
-ComponentObserverConsumer_la_LIBADD = \
- libComponentObserverStub.la
+ComponentObserverConsumer_la_LIBADD = \
+ libComponentObserverStub.la \
$(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
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-02-20 10:44:42 UTC (rev 3223)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am 2018-02-20 18:47:24 UTC (rev 3224)
@@ -55,7 +55,6 @@
NVUtil.cpp \
RTCUtil.cpp \
DefaultPeriodicTask.cpp \
- CORBA_RTCUtil.h \
CORBA_RTCUtil.cpp
MGR_SRC = \
More information about the openrtm-commit
mailing list