[openrtm-commit:02986] r3120 - in trunk/OpenRTM-aist: . examples/StaticFsm src/ext/sdo/extended_fsm src/lib/rtm src/lib/rtm/idl win32/OpenRTM-aist/ext/sdo/extended_fsm
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 12月 11日 (月) 09:42:03 JST
Author: n-ando
Date: 2017-12-11 09:42:03 +0900 (Mon, 11 Dec 2017)
New Revision: 3120
Added:
trunk/OpenRTM-aist/src/lib/rtm/idl/ExtendedFsmService.idl
Removed:
trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmService.idl
trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/Makefile.in
Modified:
trunk/OpenRTM-aist/configure.ac
trunk/OpenRTM-aist/examples/StaticFsm/Microwave.h
trunk/OpenRTM-aist/examples/StaticFsm/MicrowaveFsm.cpp
trunk/OpenRTM-aist/examples/StaticFsm/run.sh
trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmServiceProvider.cpp
trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmServiceProvider.h
trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/FsmActionListener.h
trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/extended_fsm/Makefile.am
Log:
merged changes from branches/FSM4RTC/OpenRTM-aist r2905-2910:
[FSM4RTC,example,->RELENG_2_0] StaticFsm sample which is for new Static FSM framework has been added. refs #3655
[FSM4RTC,->RELENG_2_0] ExtendedFsmService.idl moved to src/lib/rtm/idl.
[FSM4RTC,->RELENG_2_0] ExtendedFsmService.idl moved to src/lib/rtm/idl.
[FSM4RTC,example,->RELENG_2_0] StaticFsm sample which is for new Static FSM framework has been added. refs #3655
[bug,->RELENG_1_2,->RELENG_2_0] ClockManager.h->ClockManager.cpp in Makefile.am
[FSM4RTC,new file,->RELENG_2_0] Macho (Machine object state machine engine) and StaticFSM.h have been introduced to rtm. refs #3683
Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac 2017-12-11 00:37:26 UTC (rev 3119)
+++ trunk/OpenRTM-aist/configure.ac 2017-12-11 00:42:03 UTC (rev 3120)
@@ -1695,10 +1695,12 @@
examples/SeqIO/Makefile
examples/SimpleService/Makefile
examples/ExtTrigger/Makefile
+ examples/MultiInPort/Makefile
examples/Templates/Makefile
examples/Throughput/Makefile
examples/tests/Makefile
examples/Fsm/Makefile
+ examples/StaticFsm/Makefile
docs/Makefile
win32/Makefile
win32/OpenRTM-aist/Makefile
Modified: trunk/OpenRTM-aist/examples/StaticFsm/Microwave.h
===================================================================
--- trunk/OpenRTM-aist/examples/StaticFsm/Microwave.h 2017-12-11 00:37:26 UTC (rev 3119)
+++ trunk/OpenRTM-aist/examples/StaticFsm/Microwave.h 2017-12-11 00:42:03 UTC (rev 3120)
@@ -17,8 +17,6 @@
#include <rtm/DataInPort.h>
#include <rtm/DataOutPort.h>
#include <rtm/EventPort.h>
-#include <rtm/ConnectorListener.h>
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#include "MicrowaveFsm.h"
@@ -124,7 +122,7 @@
// EventPort declaration
// <rtc-template block="event_declare">
- EventInPort< Macho::Machine<MicrowaveFsm::Top> > m_eventIn;
+ EventInPort< RTC::Machine<MicrowaveFsm::Top> > m_eventIn;
// </rtc-template>
private:
Modified: trunk/OpenRTM-aist/examples/StaticFsm/MicrowaveFsm.cpp
===================================================================
--- trunk/OpenRTM-aist/examples/StaticFsm/MicrowaveFsm.cpp 2017-12-11 00:37:26 UTC (rev 3119)
+++ trunk/OpenRTM-aist/examples/StaticFsm/MicrowaveFsm.cpp 2017-12-11 00:42:03 UTC (rev 3120)
@@ -6,9 +6,7 @@
#include <iostream>
-#include <rtm/Macho.h>
#include "MicrowaveFsm.h"
-#include "Microwave.h"
namespace MicrowaveFsm
{
Modified: trunk/OpenRTM-aist/examples/StaticFsm/run.sh
===================================================================
--- trunk/OpenRTM-aist/examples/StaticFsm/run.sh 2017-12-11 00:37:26 UTC (rev 3119)
+++ trunk/OpenRTM-aist/examples/StaticFsm/run.sh 2017-12-11 00:42:03 UTC (rev 3120)
@@ -1,3 +1,3 @@
-#!/bin/sh
-
-./InputbuttonComp -f rtc.conf
+#!/bin/sh
+
+./InputbuttonComp -f rtc.conf
Deleted: trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmService.idl
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmService.idl 2017-12-11 00:37:26 UTC (rev 3119)
+++ trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmService.idl 2017-12-11 00:42:03 UTC (rev 3120)
@@ -1,37 +0,0 @@
-#ifndef _EXTENDED_FSM_SERVICE_IDL_
-#define _EXTENDED_FSM_SERVICE_IDL_
-
-#include <RTC.idl>
-
-#pragma prefix "omg.org"
-
-module RTC
-{
- struct FsmEventProfile
- {
- string name;
- string data_type;
- };
- #pragma version FsmEventProfile 1.0
- typedef sequence<FsmEventProfile> FsmEventProfileList;
-
- struct FsmStructure
- {
- string name;
- string structure;
- FsmEventProfileList event_profiles;
- NVList properties;
- };
- #pragma version FsmStructure 1.0
-
- interface ExtendedFsmService : SDOPackage::SDOService
- {
- string get_current_state();
- ReturnCode_t set_fsm_structure(in FsmStructure fsm_structure);
- ReturnCode_t get_fsm_structure(out FsmStructure fsm_structure);
- };
- #pragma version ExtendedFsmService 1.0
-};
-
-#endif // _EXTENDED_FSM_SERVICE_IDL_
-
Modified: trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmServiceProvider.cpp
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmServiceProvider.cpp 2017-12-11 00:37:26 UTC (rev 3119)
+++ trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmServiceProvider.cpp 2017-12-11 00:42:03 UTC (rev 3120)
@@ -18,7 +18,7 @@
#include <coil/stringutil.h>
#include <rtm/Typename.h>
-#include "ExtendedFsmServiceStub.h"
+#include <rtm/idl/ExtendedFsmServiceStub.h>
#include "ExtendedFsmServiceProvider.h"
#include <iostream>
@@ -89,7 +89,7 @@
*/
bool
ExtendedFsmServiceProvider::init(RTObject_impl& rtobj,
- const SDOPackage::ServiceProfile& profile)
+ const SDOPackage::ServiceProfile& profile)
{
m_rtobj = &rtobj;
m_profile = profile;
Modified: trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmServiceProvider.h
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmServiceProvider.h 2017-12-11 00:37:26 UTC (rev 3119)
+++ trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/ExtendedFsmServiceProvider.h 2017-12-11 00:42:03 UTC (rev 3120)
@@ -26,7 +26,7 @@
#include <rtm/SdoServiceProviderBase.h>
#include <rtm/ComponentActionListener.h>
#include <rtm/idl/SDOPackageStub.h>
-#include "ExtendedFsmServiceSkel.h"
+#include <rtm/idl/ExtendedFsmServiceSkel.h>
namespace RTC
{
Modified: trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/Makefile.am 2017-12-11 00:37:26 UTC (rev 3119)
+++ trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/Makefile.am 2017-12-11 00:42:03 UTC (rev 3120)
@@ -15,49 +15,15 @@
AM_LDFLAGS=-L$(top_builddir) -L$(top_builddir)/src/lib/rtm -L$(top_builddir)/src/lib/rtm/idl
#------------------------------------------------------------
-# Some rules for IDL compile
-#------------------------------------------------------------
-SUFFIXES = .o .so .idl Skel.cpp Stub.cpp Stub.o Skel.o
-
-WRAPPER = $(top_builddir)/utils/rtm-skelwrapper/rtm-skelwrapper
-WRAPPER_FLAGS = --include-dir="" --skel-suffix=Skel --stub-suffix=Stub
-
-idl-stamp: $(IDL_SOURCES)
- @touch idl-stamp
- mkdir -p idl
- (cd $(top_builddir)/utils/rtm-config; $(MAKE))
- @for f in $(IDL_SOURCES) ; do \
- cp $$f idl/ ; \
- (cd idl ; $(IDLC) $(IDLFLAGS) $$f ; cd ..) ; \
- PYTHONPATH="$(top_srcdir)/build:$(PYTHONPATH)" \
- PATH="$(top_srcdir)/utils/rtm-config:$(PATH)" \
- $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$$f --include-dir=idl/ ; \
- done ;
-
-$(ALL_SRC): idl-stamp
- @if test -f $@ ; then \
- touch $@ ; \
- else \
- rm -f idl-stamp ; \
- $(MAKE) $(AM_MAKEFLAGS) idl-stamp ; \
- fi ;
-
-#------------------------------------------------------------
# Source list
#------------------------------------------------------------
-IDL_SOURCES = ExtendedFsmService.idl
-
EXT_FSM_SVC_DIST_SRC = ExtendedFsmServiceProvider.cpp
-EXT_FSM_SVC_NODIST_SRC = $(IDL_SOURCES:.idl=Stub.cpp)
-EXT_FSM_SVC_NDWIN_SRC = $(IDL_SOURCES:.idl=Stub.cpp)
-EXT_FSM_SVC_SRC = $(EXT_FSM_SVC_DIST_SRC) $(EXT_FSM_SVC_NODIST_SRC)
-EXT_FSM_SVC_WIN_SRC = $(EXT_FSM_SVC_DIST_SRC) $(EXT_FSM_SVC_NDWIN_SRC)
+EXT_FSM_SVC_SRC = $(EXT_FSM_SVC_DIST_SRC)
+EXT_FSM_SVC_WIN_SRC = $(EXT_FSM_SVC_DIST_SRC)
EXT_FSM_SVC_DIST_H = $(EXT_FSM_SVC_DIST_SRC:.cpp=.h)
-EXT_FSM_SVC_NODIST_H = $(EXT_FSM_SVC_NODIST_SRC:.cpp=.h)
-EXT_FSM_SVC_NODWIN_H = $(EXT_FSM_SVC_NODWIN_SRC:.cpp=.h)
-EXT_FSM_SVC_H = $(EXT_FSM_SVC_DIST_H) $(EXT_FSM_SVC_NODIST_H)
-EXT_FSM_SVC_WIN_H = $(EXT_FSM_SVC_DIST_H) $(EXT_FSM_SVC_NOWIN__H)
+EXT_FSM_SVC_H = $(EXT_FSM_SVC_DIST_H)
+EXT_FSM_SVC_WIN_H = $(EXT_FSM_SVC_DIST_H)
#------------------------------------------------------------
# Object list
@@ -71,8 +37,6 @@
socompdir = $(rtm_sdodir)
# Loadable Module
-noinst_LTLIBRARIES = libExtendedFsmServiceStub.la
-nodist_libExtendedFsmServiceStub_la_SOURCES = $(IDL_SOURCES:.idl=Stub.cpp)
socomp_LTLIBRARIES = ExtendedFsmServiceProvider.la
@@ -79,9 +43,7 @@
dist_ExtendedFsmServiceProvider_la_SOURCES = \
$(EXT_FSM_SVC_DIST_SRC) $(EXT_FSM_SVC_DIST_H)
ExtendedFsmServiceProvider_la_LDFLAGS = -module
-ExtendedFsmServiceProvider_la_DEPENDENCIES = libExtendedFsmServiceStub.la
ExtendedFsmServiceProvider_la_LIBADD = \
- libExtendedFsmServiceStub.la \
$(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
@@ -88,8 +50,6 @@
#------------------------------------------------------------
# Extra distributed files
#------------------------------------------------------------
-EXTRA_DIST = $(IDL_SOURCES)
-
ALL_SRC = $(EXT_FSM_SVC_SRC)
#------------------------------------------------------------
Deleted: trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/Makefile.in
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/Makefile.in 2017-12-11 00:37:26 UTC (rev 3119)
+++ trunk/OpenRTM-aist/src/ext/sdo/extended_fsm/Makefile.in 2017-12-11 00:42:03 UTC (rev 3120)
@@ -1,900 +0,0 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
- at SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
- case $${target_option-} in \
- ?) ;; \
- *) echo "am__make_running_with_option: internal error: invalid" \
- "target option '$${target_option-}' specified" >&2; \
- exit 1;; \
- esac; \
- has_opt=no; \
- sane_makeflags=$$MAKEFLAGS; \
- if $(am__is_gnu_make); then \
- sane_makeflags=$$MFLAGS; \
- else \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- bs=\\; \
- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
- esac; \
- fi; \
- skip_next=no; \
- strip_trailopt () \
- { \
- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
- }; \
- for flg in $$sane_makeflags; do \
- test $$skip_next = yes && { skip_next=no; continue; }; \
- case $$flg in \
- *=*|--*) continue;; \
- -*I) strip_trailopt 'I'; skip_next=yes;; \
- -*I?*) strip_trailopt 'I';; \
- -*O) strip_trailopt 'O'; skip_next=yes;; \
- -*O?*) strip_trailopt 'O';; \
- -*l) strip_trailopt 'l'; skip_next=yes;; \
- -*l?*) strip_trailopt 'l';; \
- -[dEDm]) skip_next=yes;; \
- -[JT]) skip_next=yes;; \
- esac; \
- case $$flg in \
- *$$target_option*) has_opt=yes; break;; \
- esac; \
- done; \
- test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/ext/sdo/extended_fsm
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/depcomp
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/libtool.m4 $(top_srcdir)/openrtm.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/lib/rtm/config_rtc.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-am__installdirs = "$(DESTDIR)$(socompdir)"
-LTLIBRARIES = $(noinst_LTLIBRARIES) $(socomp_LTLIBRARIES)
-am__objects_1 = ExtendedFsmServiceProvider.lo
-am__objects_2 =
-am__objects_3 = $(am__objects_2)
-dist_ExtendedFsmServiceProvider_la_OBJECTS = $(am__objects_1) \
- $(am__objects_3)
-ExtendedFsmServiceProvider_la_OBJECTS = \
- $(dist_ExtendedFsmServiceProvider_la_OBJECTS)
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
-ExtendedFsmServiceProvider_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
- $(AM_CXXFLAGS) $(CXXFLAGS) \
- $(ExtendedFsmServiceProvider_la_LDFLAGS) $(LDFLAGS) -o $@
-libExtendedFsmServiceStub_la_LIBADD =
-am__objects_4 = ExtendedFsmServiceStub.lo
-nodist_libExtendedFsmServiceStub_la_OBJECTS = $(am__objects_4)
-libExtendedFsmServiceStub_la_OBJECTS = \
- $(nodist_libExtendedFsmServiceStub_la_OBJECTS)
-AM_V_P = $(am__v_P_ at AM_V@)
-am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_ at AM_V@)
-am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_ at AM_V@)
-am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/src/lib/rtm
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_ at AM_V@)
-am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
-am__v_CXX_0 = @echo " CXX " $@;
-am__v_CXX_1 =
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
-am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo " CXXLD " $@;
-am__v_CXXLD_1 =
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_ at AM_V@)
-am__v_CC_ = $(am__v_CC_ at AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-am__v_CC_1 =
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_ at AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-am__v_CCLD_1 =
-SOURCES = $(dist_ExtendedFsmServiceProvider_la_SOURCES) \
- $(nodist_libExtendedFsmServiceStub_la_SOURCES)
-DIST_SOURCES = $(dist_ExtendedFsmServiceProvider_la_SOURCES)
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates. Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
- BEGIN { nonempty = 0; } \
- { items[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique. This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
- list='$(am__tagged_files)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-ARTLIB = @ARTLIB@
-ARTLINUX = @ARTLINUX@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-COSNAMES = @COSNAMES@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DOCS = @DOCS@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-IDLC = @IDLC@
-IDL_FLAGS = @IDL_FLAGS@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LDSO = @LDSO@
-LDSOLIBS = @LDSOLIBS@
-LDSOOPTS = @LDSOOPTS@
-LIBOBJS = @LIBOBJS@
-LIBRARY = @LIBRARY@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-ORB = @ORB@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PYTHON_FLAGS = @PYTHON_FLAGS@
-RANLIB = @RANLIB@
-RTM_DESCRIPTION = @RTM_DESCRIPTION@
-RTM_MAJOR_VERSION = @RTM_MAJOR_VERSION@
-RTM_MINOR_VERSION = @RTM_MINOR_VERSION@
-RTM_REVISION_NUM = @RTM_REVISION_NUM@
-RTM_SHORT_VERSION = @RTM_SHORT_VERSION@
-RTM_VERSION = @RTM_VERSION@
-RTPREEMPTEC = @RTPREEMPTEC@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SOEXT = @SOEXT@
-STRIP = @STRIP@
-TARGET = @TARGET@
-UNITTEST = @UNITTEST@
-VERSION = @VERSION@
-WRAPPERS = @WRAPPERS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-coil_includedir = @coil_includedir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgconfigdir = @pkgconfigdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-rtm_datadir = @rtm_datadir@
-rtm_docdir = @rtm_docdir@
-rtm_ecdir = @rtm_ecdir@
-rtm_exampledir = @rtm_exampledir@
-rtm_idldir = @rtm_idldir@
-rtm_includedir = @rtm_includedir@
-rtm_libdir = @rtm_libdir@
-rtm_rtcdir = @rtm_rtcdir@
-rtm_rtmdir = @rtm_rtmdir@
-rtm_sdodir = @rtm_sdodir@
-rtm_svcdir = @rtm_svcdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-subdirs = @subdirs@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = 1.9
-IDLFLAGS = @IDL_FLAGS@ -I../$(top_srcdir)/src/lib/rtm/idl
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/coil/include -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
-
-#------------------------------------------------------------
-# Some rules for IDL compile
-#------------------------------------------------------------
-SUFFIXES = .o .so .idl Skel.cpp Stub.cpp Stub.o Skel.o
-WRAPPER = $(top_builddir)/utils/rtm-skelwrapper/rtm-skelwrapper
-WRAPPER_FLAGS = --include-dir="" --skel-suffix=Skel --stub-suffix=Stub
-
-#------------------------------------------------------------
-# Source list
-#------------------------------------------------------------
-IDL_SOURCES = ExtendedFsmService.idl
-EXT_FSM_SVC_DIST_SRC = ExtendedFsmServiceProvider.cpp
-EXT_FSM_SVC_NODIST_SRC = $(IDL_SOURCES:.idl=Stub.cpp)
-EXT_FSM_SVC_NDWIN_SRC = $(IDL_SOURCES:.idl=Stub.cpp)
-EXT_FSM_SVC_SRC = $(EXT_FSM_SVC_DIST_SRC) $(EXT_FSM_SVC_NODIST_SRC)
-EXT_FSM_SVC_WIN_SRC = $(EXT_FSM_SVC_DIST_SRC) $(EXT_FSM_SVC_NDWIN_SRC)
-EXT_FSM_SVC_DIST_H = $(EXT_FSM_SVC_DIST_SRC:.cpp=.h)
-EXT_FSM_SVC_NODIST_H = $(EXT_FSM_SVC_NODIST_SRC:.cpp=.h)
-EXT_FSM_SVC_NODWIN_H = $(EXT_FSM_SVC_NODWIN_SRC:.cpp=.h)
-EXT_FSM_SVC_H = $(EXT_FSM_SVC_DIST_H) $(EXT_FSM_SVC_NODIST_H)
-EXT_FSM_SVC_WIN_H = $(EXT_FSM_SVC_DIST_H) $(EXT_FSM_SVC_NOWIN__H)
-
-#------------------------------------------------------------
-# Object list
-#------------------------------------------------------------
-EXT_FSM_SVC_OBJ = $(EXT_FSM_SVC_DIST_SRC:.cpp=.o)
-
-#------------------------------------------------------------
-# Targets
-#------------------------------------------------------------
-# Targets directories
-socompdir = $(rtm_sdodir)
-
-# Loadable Module
-noinst_LTLIBRARIES = libExtendedFsmServiceStub.la
-nodist_libExtendedFsmServiceStub_la_SOURCES = $(IDL_SOURCES:.idl=Stub.cpp)
-socomp_LTLIBRARIES = ExtendedFsmServiceProvider.la
-dist_ExtendedFsmServiceProvider_la_SOURCES = \
- $(EXT_FSM_SVC_DIST_SRC) $(EXT_FSM_SVC_DIST_H)
-
-ExtendedFsmServiceProvider_la_LDFLAGS = -module
-ExtendedFsmServiceProvider_la_DEPENDENCIES = libExtendedFsmServiceStub.la
-ExtendedFsmServiceProvider_la_LIBADD = \
- libExtendedFsmServiceStub.la \
- $(top_builddir)/src/lib/rtm/libRTC.la \
- $(top_builddir)/src/lib/coil/lib/libcoil.la
-
-
-#------------------------------------------------------------
-# Extra distributed files
-#------------------------------------------------------------
-EXTRA_DIST = $(IDL_SOURCES)
-ALL_SRC = $(EXT_FSM_SVC_SRC)
-
-#------------------------------------------------------------
-# Visual Studio Project
-#------------------------------------------------------------
-win32_builddir = $(top_builddir)/win32/OpenRTM-aist/ext/sdo/extended_fsm
-PROJNAME = ExtendedFsmServiceProvider
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .o .so .idl Skel.cpp Stub.cpp Stub.o Skel.o .cpp .lo .obj
-$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/ext/sdo/extended_fsm/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/ext/sdo/extended_fsm/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-clean-noinstLTLIBRARIES:
- -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
- @list='$(noinst_LTLIBRARIES)'; \
- locs=`for p in $$list; do echo $$p; done | \
- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
- sort -u`; \
- test -z "$$locs" || { \
- echo rm -f $${locs}; \
- rm -f $${locs}; \
- }
-
-install-socompLTLIBRARIES: $(socomp_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- @list='$(socomp_LTLIBRARIES)'; test -n "$(socompdir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(MKDIR_P) '$(DESTDIR)$(socompdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(socompdir)" || exit 1; \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(socompdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(socompdir)"; \
- }
-
-uninstall-socompLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(socomp_LTLIBRARIES)'; test -n "$(socompdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(socompdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(socompdir)/$$f"; \
- done
-
-clean-socompLTLIBRARIES:
- -test -z "$(socomp_LTLIBRARIES)" || rm -f $(socomp_LTLIBRARIES)
- @list='$(socomp_LTLIBRARIES)'; \
- locs=`for p in $$list; do echo $$p; done | \
- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
- sort -u`; \
- test -z "$$locs" || { \
- echo rm -f $${locs}; \
- rm -f $${locs}; \
- }
-
-ExtendedFsmServiceProvider.la: $(ExtendedFsmServiceProvider_la_OBJECTS) $(ExtendedFsmServiceProvider_la_DEPENDENCIES) $(EXTRA_ExtendedFsmServiceProvider_la_DEPENDENCIES)
- $(AM_V_CXXLD)$(ExtendedFsmServiceProvider_la_LINK) -rpath $(socompdir) $(ExtendedFsmServiceProvider_la_OBJECTS) $(ExtendedFsmServiceProvider_la_LIBADD) $(LIBS)
-
-libExtendedFsmServiceStub.la: $(libExtendedFsmServiceStub_la_OBJECTS) $(libExtendedFsmServiceStub_la_DEPENDENCIES) $(EXTRA_libExtendedFsmServiceStub_la_DEPENDENCIES)
- $(AM_V_CXXLD)$(CXXLINK) $(libExtendedFsmServiceStub_la_OBJECTS) $(libExtendedFsmServiceStub_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ExtendedFsmServiceProvider.Plo at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ExtendedFsmServiceStub.Plo at am__quote@
-
-.cpp.o:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
- at am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- at am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCXX_FALSE@ $(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-ID: $(am__tagged_files)
- $(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- set x; \
- here=`pwd`; \
- $(am__define_uniq_tagged_files); \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
- $(am__define_uniq_tagged_files); \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
- list='$(am__tagged_files)'; \
- case "$(srcdir)" in \
- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
- *) sdir=$(subdir)/$(srcdir) ;; \
- esac; \
- for i in $$list; do \
- if test -f "$$i"; then \
- echo "$(subdir)/$$i"; \
- else \
- echo "$$sdir/$$i"; \
- fi; \
- done >> $(top_builddir)/cscope.files
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$(top_distdir)" distdir="$(distdir)" \
- dist-hook
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES)
-installdirs:
- for dir in "$(DESTDIR)$(socompdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local \
- clean-noinstLTLIBRARIES clean-socompLTLIBRARIES mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-socompLTLIBRARIES
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-socompLTLIBRARIES
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-local clean-noinstLTLIBRARIES \
- clean-socompLTLIBRARIES cscopelist-am ctags ctags-am dist-hook \
- distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-socompLTLIBRARIES \
- install-strip installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
- uninstall-socompLTLIBRARIES
-
-
-idl-stamp: $(IDL_SOURCES)
- @touch idl-stamp
- mkdir -p idl
- (cd $(top_builddir)/utils/rtm-config; $(MAKE))
- @for f in $(IDL_SOURCES) ; do \
- cp $$f idl/ ; \
- (cd idl ; $(IDLC) $(IDLFLAGS) $$f ; cd ..) ; \
- PYTHONPATH="$(top_srcdir)/build:$(PYTHONPATH)" \
- PATH="$(top_srcdir)/utils/rtm-config:$(PATH)" \
- $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$$f --include-dir=idl/ ; \
- done ;
-
-$(ALL_SRC): idl-stamp
- @if test -f $@ ; then \
- touch $@ ; \
- else \
- rm -f idl-stamp ; \
- $(MAKE) $(AM_MAKEFLAGS) idl-stamp ; \
- fi ;
-
-#------------------------------------------------------------
-# File list for deb/ports packages
-#------------------------------------------------------------
-lst:
- echo $(ALL_SRC) > src.lst
- echo $(EXTRA_DIST) > other.lst
-
-vcproj: vc8proj vc9proj vc10proj vc11proj vc12proj vc14proj
-
-vc8proj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "8.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(EXT_FSM_SVC_WIN_SRC) \
- --header $(EXT_FSM_SVC_WIN_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj
-
-vc9proj:
- $(top_builddir)/build/vcprojtool.py vcproj \
- --type DLL \
- --vcversion "9.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(EXT_FSM_SVC_WIN_SRC) \
- --header $(EXT_FSM_SVC_WIN_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj
-
-vc10proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "10.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(EXT_FSM_SVC_WIN_SRC) \
- --header $(EXT_FSM_SVC_WIN_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj
-
-vc11proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "11.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc11.vcxproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(EXT_FSM_SVC_WIN_SRC) \
- --header $(EXT_FSM_SVC_WIN_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc11.vcxproj
-
-vc12proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "12.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc12.vcxproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(EXT_FSM_SVC_WIN_SRC) \
- --header $(EXT_FSM_SVC_WIN_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc12.vcxproj
-
-vc14proj:
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "14.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc14.vcxproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(EXT_FSM_SVC_WIN_SRC) \
- --header $(EXT_FSM_SVC_WIN_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc14.vcxproj
-
-dist-hook: lst vcproj
-
-clean_objs:
- rm -f $(OBJS)
-
-clean_skelstub:
- rm -f *Skel.h *Skel.cpp
- rm -f *Stub.h *Stub.cpp
- rm -rf idl
- rm -f *.hh *SK.cc
- rm -f *C.cpp *C.h *S.cpp *S.h *_T.cpp *_T.h *.inl
-
-clean-local: clean_objs clean_skelstub
- rm -f *.bak *.rpo *.sym lib*.*_pure_*
- rm -f *.lst *core *~ *loT *.log
- rm -f Makefile.old
- rm -rf idl-stamp
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Modified: trunk/OpenRTM-aist/src/lib/rtm/FsmActionListener.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/FsmActionListener.h 2017-12-11 00:37:26 UTC (rev 3119)
+++ trunk/OpenRTM-aist/src/lib/rtm/FsmActionListener.h 2017-12-11 00:42:03 UTC (rev 3120)
@@ -26,12 +26,10 @@
#include <rtm/RTC.h>
#include <rtm/idl/RTCSkel.h>
#include <rtm/ConnectorBase.h>
+#include <rtm/idl/ExtendedFsmServiceStub.h>
namespace RTC
{
- struct FsmStructure
- {
- };
/*!
* @if jp
*
Modified: trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Makefile.am 2017-12-11 00:37:26 UTC (rev 3119)
+++ trunk/OpenRTM-aist/src/lib/rtm/Makefile.am 2017-12-11 00:42:03 UTC (rev 3120)
@@ -177,6 +177,7 @@
SdoServiceProviderBase.h \
SdoServiceConsumerBase.h \
StateMachine.h \
+ StaticFSM.h \
Typename.h \
Timestamp.h \
LocalServiceBase.h \
Copied: trunk/OpenRTM-aist/src/lib/rtm/idl/ExtendedFsmService.idl (from rev 2910, branches/FSM4RTC/OpenRTM-aist/src/lib/rtm/idl/ExtendedFsmService.idl)
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/ExtendedFsmService.idl (rev 0)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/ExtendedFsmService.idl 2017-12-11 00:42:03 UTC (rev 3120)
@@ -0,0 +1,37 @@
+#ifndef _EXTENDED_FSM_SERVICE_IDL_
+#define _EXTENDED_FSM_SERVICE_IDL_
+
+#include <RTC.idl>
+
+#pragma prefix "omg.org"
+
+module RTC
+{
+ struct FsmEventProfile
+ {
+ string name;
+ string data_type;
+ };
+ #pragma version FsmEventProfile 1.0
+ typedef sequence<FsmEventProfile> FsmEventProfileList;
+
+ struct FsmStructure
+ {
+ string name;
+ string structure;
+ FsmEventProfileList event_profiles;
+ NVList properties;
+ };
+ #pragma version FsmStructure 1.0
+
+ interface ExtendedFsmService : SDOPackage::SDOService
+ {
+ string get_current_state();
+ ReturnCode_t set_fsm_structure(in FsmStructure fsm_structure);
+ ReturnCode_t get_fsm_structure(out FsmStructure fsm_structure);
+ };
+ #pragma version ExtendedFsmService 1.0
+};
+
+#endif // _EXTENDED_FSM_SERVICE_IDL_
+
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2017-12-11 00:37:26 UTC (rev 3119)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2017-12-11 00:42:03 UTC (rev 3120)
@@ -10,7 +10,7 @@
SUBDIRS = . device_interfaces
IDLC = @IDLC@
-IDLFLAGS = @IDL_FLAGS@
+IDLFLAGS = @IDL_FLAGS@ -I.
LIBS = @LIBS@
AM_CPPFLAGS=-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/rtm
AM_LDFLAGS=-L$(top_builddir)/src/lib/rtm -L$(top_builddir)/src/lib/rtm/idl
@@ -27,6 +27,7 @@
BasicDataType.idl \
DataPort.idl \
ExtendedDataTypes.idl \
+ ExtendedFsmService.idl\
InterfaceDataTypes.idl\
SharedMemory.idl
endif
@@ -81,6 +82,7 @@
BasicDataTypeSkel.h \
DataPortSkel.h \
ExtendedDataTypesSkel.h \
+ ExtendedFsmServiceSkel.h\
InterfaceDataTypesSkel.h\
SharedMemorySkel.h
ORB_SRC = $(RTORB_SRC)
@@ -142,6 +144,7 @@
echo '// This IDL file is for only RtORB' > OpenRTM-aist.idl
echo '#include "BasicDataType.idl"' >> OpenRTM-aist.idl
echo '#include "ExtendedDataTypes.idl"' >> OpenRTM-aist.idl
+ echo '#include "ExtendedFsmService.idl"' >> OpenRTM-aist.idl
echo '#include "RTC.idl"' >> OpenRTM-aist.idl
echo '#include "OpenRTM.idl"' >> OpenRTM-aist.idl
echo '#pragma ""' >> OpenRTM-aist.idl
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/extended_fsm/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/extended_fsm/Makefile.am 2017-12-11 00:37:26 UTC (rev 3119)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/extended_fsm/Makefile.am 2017-12-11 00:42:03 UTC (rev 3120)
@@ -13,7 +13,6 @@
src:
cp -p $(top_srcdir)/src/ext/sdo/extended_fsm/*.cpp .
cp -p $(top_srcdir)/src/ext/sdo/extended_fsm/*.h .
- cp -p $(top_srcdir)/src/ext/sdo/extended_fsm/*.idl .
qkc -O- -ms *.cpp
qkc -O- -ms *.h
qkc -O- -ms *.idl
More information about the openrtm-commit
mailing list