[openrtm-commit:02934] r3087 - trunk/OpenRTM-aist/src/ext/ec/logical_time

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-11-22 19:02:32 +0900 (Wed, 22 Nov 2017)
New Revision: 3087

Modified:
   trunk/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.cpp
   trunk/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.h
   trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
Log:
[incompat,->RELENG_1_2] LogicalTimeTriggeredEC has been added to build under Windows. refs #4368

Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.cpp
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.cpp	2017-11-22 07:11:29 UTC (rev 3086)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.cpp	2017-11-22 10:02:32 UTC (rev 3087)
@@ -23,7 +23,7 @@
 
 #include <rtm/ECFactory.h>
 #include <rtm/RTObjectStateMachine.h>
-#include <LogicalTimeTriggeredEC.h>
+#include "LogicalTimeTriggeredEC.h"
 
 namespace RTC
 {

Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.h
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.h	2017-11-22 07:11:29 UTC (rev 3086)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/LogicalTimeTriggeredEC.h	2017-11-22 10:02:32 UTC (rev 3087)
@@ -26,7 +26,7 @@
 #include <coil/ClockManager.h>
 
 #include <rtm/ExecutionContextBase.h>
-#include <LogicalTimeTriggeredECSkel.h>
+#include "LogicalTimeTriggeredECSkel.h"
 
 #ifdef WIN32
 #pragma warning( disable : 4290 )

Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am	2017-11-22 07:11:29 UTC (rev 3086)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am	2017-11-22 10:02:32 UTC (rev 3087)
@@ -50,8 +50,8 @@
 IDL_SOURCES = LogicalTimeTriggeredEC.idl
 
 OBSERVER_DIST_SRC   = LogicalTimeTriggeredEC.cpp
-OBSERVER_NODIST_SRC = $(IDL_SOURCES:.idl=Stub.cpp) $(IDL_SOURCES:.idl=Skel.cpp)
-OBSERVER_NDWIN_SRC  = $(IDL_SOURCES:.idl=Stub.cpp) $(IDL_SOURCES:.idl=Skel.cpp)
+OBSERVER_NODIST_SRC = $(IDL_SOURCES:.idl=Skel.cpp)
+OBSERVER_NDWIN_SRC  = $(IDL_SOURCES:.idl=Skel.cpp)
 OBSERVER_SRC        = $(OBSERVER_DIST_SRC) $(OBSERVER_NODIST_SRC)
 OBSERVER_WIN_SRC    = $(OBSERVER_DIST_SRC) $(OBSERVER_NDWIN_SRC)
 
@@ -73,9 +73,8 @@
 socompdir = $(rtm_ecdir)
 
 # Loadable Module
-noinst_LTLIBRARIES = libLogicalTimeTriggeredECSkel.la libLogicalTimeTriggeredECStub.la 
+noinst_LTLIBRARIES = libLogicalTimeTriggeredECSkel.la 
 nodist_libLogicalTimeTriggeredECSkel_la_SOURCES = $(IDL_SOURCES:.idl=Skel.cpp)
-nodist_libLogicalTimeTriggeredECStub_la_SOURCES = $(IDL_SOURCES:.idl=Stub.cpp)
 
 socomp_LTLIBRARIES = LogicalTimeTriggeredEC.la
 
@@ -84,7 +83,7 @@
 LogicalTimeTriggeredEC_la_LDFLAGS = -module
 LogicalTimeTriggeredEC_la_DEPENDENCIES = libLogicalTimeTriggeredECSkel.la
 LogicalTimeTriggeredEC_la_LIBADD  =                 \
-	libLogicalTimeTriggeredECStub.la            \
+	libLogicalTimeTriggeredECSkel.la            \
 	$(top_builddir)/src/lib/rtm/libRTC.la       \
 	$(top_builddir)/src/lib/coil/lib/libcoil.la