[openrtm-commit:00787] r2351 - in trunk/OpenRTM-aist: examples/SimpleService src/ext/ec/artlinux src/ext/ec/artlinux/example src/ext/ec/logical_time src/ext/ec/logical_time/example src/ext/ec/rtpreempt src/ext/local_service src/ext/local_service/nameservice_file src/ext/sdo/observer src/lib/rtm src/lib/rtm/idl utils/rtm-skelwrapper
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2012年 4月 9日 (月) 12:40:15 JST
Author: n-ando
Date: 2012-04-09 12:40:14 +0900 (Mon, 09 Apr 2012)
New Revision: 2351
Removed:
trunk/OpenRTM-aist/src/ext/ec/artlinux/example/Makefile
Modified:
trunk/OpenRTM-aist/examples/SimpleService/Makefile.am
trunk/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am
trunk/OpenRTM-aist/src/ext/ec/artlinux/example/
trunk/OpenRTM-aist/src/ext/ec/logical_time/
trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
trunk/OpenRTM-aist/src/ext/ec/logical_time/example/
trunk/OpenRTM-aist/src/ext/ec/rtpreempt/
trunk/OpenRTM-aist/src/ext/local_service/
trunk/OpenRTM-aist/src/ext/local_service/nameservice_file/
trunk/OpenRTM-aist/src/ext/local_service/nameservice_file/FileNameservice.cpp
trunk/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.cpp
trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.cpp
trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h
trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
trunk/OpenRTM-aist/utils/rtm-skelwrapper/skel_wrapper.py
Log:
Some modification to support RtORB. refs #2404
Modified: trunk/OpenRTM-aist/examples/SimpleService/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/SimpleService/Makefile.am 2012-04-06 06:15:08 UTC (rev 2350)
+++ trunk/OpenRTM-aist/examples/SimpleService/Makefile.am 2012-04-09 03:40:14 UTC (rev 2351)
@@ -289,6 +289,8 @@
rm -f *Stub.h *Stub.cpp
rm -f *.hh *SK.cc
rm -f *C.cpp *C.h *S.cpp *S.h *_T.cpp *_T.h *.inl
+ rm -f *-common.c *-decls.h *-skelimpl.c *-skels.c *-stubs.c
+ rm -f MyService.h MyService.hh
clean-local: clean_objs clean_skelstub
rm -f *.bak *.rpo *.sym lib*.*_pure_*
Modified: trunk/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am 2012-04-06 06:15:08 UTC (rev 2350)
+++ trunk/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am 2012-04-09 03:40:14 UTC (rev 2351)
@@ -25,5 +25,5 @@
ArtExecutionContext_la_FLAGS = -L$(top_builddir)/src/lib/rtm/.lib
ArtExecutionContext_la_LIBADD = $(top_builddir)/src/lib/rtm/libRTC.la $(ARTLIB)
-clean:
+clean-local:
rm -rf *~ *.o *.so
Property changes on: trunk/OpenRTM-aist/src/ext/ec/artlinux/example
___________________________________________________________________
Added: svn:ignore
+ .deps
Makefile.in
Deleted: trunk/OpenRTM-aist/src/ext/ec/artlinux/example/Makefile
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/artlinux/example/Makefile 2012-04-06 06:15:08 UTC (rev 2350)
+++ trunk/OpenRTM-aist/src/ext/ec/artlinux/example/Makefile 2012-04-09 03:40:14 UTC (rev 2351)
@@ -1,668 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# src/ext/ec/artlinux/example/Makefile. Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
-
-
-
-
-
-pkgdatadir = $(datadir)/OpenRTM-aist
-pkgincludedir = $(includedir)/OpenRTM-aist
-pkglibdir = $(libdir)/OpenRTM-aist
-pkglibexecdir = $(libexecdir)/OpenRTM-aist
-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 = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-example_PROGRAMS = ARTSampleComp$(EXEEXT)
-subdir = src/ext/ec/artlinux/example
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-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__installdirs = "$(DESTDIR)$(exampledir)" "$(DESTDIR)$(exampledir)" \
- "$(DESTDIR)$(sourcedir)"
-PROGRAMS = $(example_PROGRAMS)
-am_ARTSampleComp_OBJECTS = ARTSampleComp.$(OBJEXT) ARTSample.$(OBJEXT)
-ARTSampleComp_OBJECTS = $(am_ARTSampleComp_OBJECTS)
-ARTSampleComp_DEPENDENCIES = $(top_builddir)/src/lib/rtm/libRTC.la \
- $(top_builddir)/src/lib/coil/lib/libcoil.la
-ARTSampleComp_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
- $(CXXFLAGS) $(ARTSampleComp_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -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) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
-SOURCES = $(ARTSampleComp_SOURCES)
-DIST_SOURCES = $(ARTSampleComp_SOURCES)
-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'
-DATA = $(example_DATA) $(source_DATA)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/n-ando/OpenRTM-aist/missing --run aclocal-1.11
-AMTAR = ${SHELL} /home/n-ando/OpenRTM-aist/missing --run tar
-AR = ar
-ARTLIB = /usr/lib/art_syscalls.o
-ARTLINUX = artlinux
-AS = as
-AUTOCONF = ${SHELL} /home/n-ando/OpenRTM-aist/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/n-ando/OpenRTM-aist/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/n-ando/OpenRTM-aist/missing --run automake-1.11
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-COSNAMES = /usr/bin/omniNames
-CPP = gcc -E
-CPPFLAGS = -Wall -fPIC -O2
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -Wall -fPIC -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DLLTOOL = dlltool
-DSYMUTIL =
-DUMPBIN =
-ECHO_C =
-ECHO_N = -n
-ECHO_T =
-EGREP = /bin/grep -E
-EXEEXT =
-FGREP = /bin/grep -F
-GREP = /bin/grep
-IDLC = /usr/bin/omniidl
-IDL_FLAGS = -bcxx -Wba -nf
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LD = /usr/bin/ld
-LDFLAGS = -luuid -ldl -export-dynamic
-LDSO =
-LDSOLIBS = -lomniORB4 -lomnithread -lomniDynamic4
-LDSOOPTS =
-LIBOBJS =
-LIBRARY =
-LIBS = -lpthread -lomniORB4 -lomnithread -lomniDynamic4
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIPO =
-LN_S = ln -s
-LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/n-ando/OpenRTM-aist/missing --run makeinfo
-MKDIR_P = /bin/mkdir -p
-NM = /usr/bin/nm -B
-NMEDIT =
-OBJDUMP = objdump
-OBJEXT = o
-ORB = omniORB
-OTOOL =
-OTOOL64 =
-PACKAGE = OpenRTM-aist
-PACKAGE_BUGREPORT = n-ando at aist.go.jp
-PACKAGE_NAME = OpenRTM-aist
-PACKAGE_STRING = OpenRTM-aist 1.1.0
-PACKAGE_TARNAME = OpenRTM-aist
-PACKAGE_URL =
-PACKAGE_VERSION = 1.1.0
-PATH_SEPARATOR = :
-PYTHON_FLAGS =
-RANLIB = ranlib
-RTM_DESCRIPTION = An OMG RTC compliant middleware for robots.
-RTM_MAJOR_VERSION = 1
-RTM_MINOR_VERSION = 1
-RTM_REVISION_NUM = 0
-RTM_SHORT_VERSION = 110
-RTM_VERSION = 1.1.0
-RTPREEMPTEC = rtpreempt
-SED = /bin/sed
-SET_MAKE =
-SHELL = /bin/bash
-SOEXT =
-STRIP = strip
-TARGET =
-UNITTEST =
-VERSION = 1.1.0
-WRAPPERS =
-abs_builddir = /home/n-ando/OpenRTM-aist/src/ext/ec/artlinux/example
-abs_srcdir = /home/n-ando/OpenRTM-aist/src/ext/ec/artlinux/example
-abs_top_builddir = /home/n-ando/OpenRTM-aist
-abs_top_srcdir = /home/n-ando/OpenRTM-aist
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_DUMPBIN =
-am__include = include
-am__leading_dot = .
-am__quote =
-am__tar = tar --format=posix -chf - "$$tardir"
-am__untar = tar -xf -
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias =
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-builddir = .
-coil_includedir = ${prefix}/include/coil-1.1
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datarootdir}/doc/${PACKAGE_TARNAME}
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias =
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = ${SHELL} /home/n-ando/OpenRTM-aist/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localedir = ${datarootdir}/locale
-localstatedir = ${prefix}/var
-lt_ECHO = echo
-mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-pkgconfigdir = ${libdir}/pkgconfig
-prefix = /usr/local
-program_transform_name = s,x,x,
-psdir = ${docdir}
-rtm_datadir = ${datarootdir}/openrtm-1.1
-rtm_docdir = ${datarootdir}/openrtm-1.1/doc
-rtm_ecdir = ${exec_prefix}/lib/openrtm-1.1/ec
-rtm_exampledir = ${datarootdir}/openrtm-1.1/example
-rtm_idldir = ${prefix}/include/openrtm-1.1/rtm/idl
-rtm_includedir = ${prefix}/include/openrtm-1.1
-rtm_libdir = ${exec_prefix}/lib/openrtm-1.1
-rtm_rtcdir = ${exec_prefix}/lib/openrtm-1.1/rtc
-rtm_rtmdir = ${exec_prefix}/lib/openrtm-1.1/rtm
-rtm_sdodir = ${exec_prefix}/lib/openrtm-1.1/sdo
-rtm_svcdir = ${exec_prefix}/lib/openrtm-1.1/svc
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-subdirs = src/lib/coil
-sysconfdir = ${prefix}/etc
-target_alias =
-top_build_prefix = ../../../../../
-top_builddir = ../../../../..
-top_srcdir = ../../../../..
-AUTOMAKE_OPTIONS = 1.4
-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
-
-#------------------------------------------------------------
-# Targets
-#------------------------------------------------------------
-# Targets directories
-exampledir = $(rtm_exampledir)
-socompdir = $(exampledir)/rtc
-sourcedir = $(exampledir)/src/ARTSample
-example_DATA = rtc.conf
-ARTSampleComp_SOURCES = ARTSampleComp.cpp ARTSample.cpp ARTSample.h
-ARTSampleComp_LDADD = $(top_builddir)/src/lib/rtm/libRTC.la \
- $(top_builddir)/src/lib/coil/lib/libcoil.la
-
-ARTSampleComp_LDFLAGS = -L$(top_builddir)/src/lib/rtm/.libs
-
-# Example sources
-source_DATA = $(ALL_SRC) $(EXTRA_DIST)
-
-#------------------------------------------------------------
-# Extra distributed files
-#------------------------------------------------------------
-EXTRA_DIST = rtc.conf
-ALL_SRC = $(ARTSampleComp_SOURCES)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cpp .lo .o .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/ec/artlinux/example/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu src/ext/ec/artlinux/example/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):
-install-examplePROGRAMS: $(example_PROGRAMS)
- @$(NORMAL_INSTALL)
- test -z "$(exampledir)" || $(MKDIR_P) "$(DESTDIR)$(exampledir)"
- @list='$(example_PROGRAMS)'; test -n "$(exampledir)" || list=; \
- for p in $$list; do echo "$$p $$p"; done | \
- sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p || test -f $$p1; \
- then echo "$$p"; echo "$$p"; else :; fi; \
- done | \
- sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
- -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
- sed 'N;N;N;s,\n, ,g' | \
- $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
- { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
- if ($$2 == $$4) files[d] = files[d] " " $$1; \
- else { print "f", $$3 "/" $$4, $$1; } } \
- END { for (d in files) print "f", d, files[d] }' | \
- while read type dir files; do \
- if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
- test -z "$$files" || { \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(exampledir)$$dir'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(exampledir)$$dir" || exit $$?; \
- } \
- ; done
-
-uninstall-examplePROGRAMS:
- @$(NORMAL_UNINSTALL)
- @list='$(example_PROGRAMS)'; test -n "$(exampledir)" || list=; \
- files=`for p in $$list; do echo "$$p"; done | \
- sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
- -e 's/$$/$(EXEEXT)/' `; \
- test -n "$$list" || exit 0; \
- echo " ( cd '$(DESTDIR)$(exampledir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(exampledir)" && rm -f $$files
-
-clean-examplePROGRAMS:
- @list='$(example_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
-ARTSampleComp$(EXEEXT): $(ARTSampleComp_OBJECTS) $(ARTSampleComp_DEPENDENCIES)
- @rm -f ARTSampleComp$(EXEEXT)
- $(ARTSampleComp_LINK) $(ARTSampleComp_OBJECTS) $(ARTSampleComp_LDADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-include ./$(DEPDIR)/ARTSample.Po
-include ./$(DEPDIR)/ARTSampleComp.Po
-
-.cpp.o:
- $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-# source='$<' object='$@' libtool=no \
-# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-# $(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
- $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
- $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-# source='$<' object='$@' libtool=no \
-# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-# $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
- $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
- $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-# source='$<' object='$@' libtool=yes \
-# DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-# $(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-exampleDATA: $(example_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(exampledir)" || $(MKDIR_P) "$(DESTDIR)$(exampledir)"
- @list='$(example_DATA)'; test -n "$(exampledir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(exampledir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(exampledir)" || exit $$?; \
- done
-
-uninstall-exampleDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(example_DATA)'; test -n "$(exampledir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(exampledir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(exampledir)" && rm -f $$files
-install-sourceDATA: $(source_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(sourcedir)" || $(MKDIR_P) "$(DESTDIR)$(sourcedir)"
- @list='$(source_DATA)'; test -n "$(sourcedir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sourcedir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(sourcedir)" || exit $$?; \
- done
-
-uninstall-sourceDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(source_DATA)'; test -n "$(sourcedir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(sourcedir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(sourcedir)" && rm -f $$files
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- 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
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- 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"
-
-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
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS) $(DATA)
-installdirs:
- for dir in "$(DESTDIR)$(exampledir)" "$(DESTDIR)$(exampledir)" "$(DESTDIR)$(sourcedir)"; 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:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-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-examplePROGRAMS clean-generic clean-libtool \
- clean-local 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-exampleDATA install-examplePROGRAMS \
- install-sourceDATA
-
-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-exampleDATA uninstall-examplePROGRAMS \
- uninstall-sourceDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean \
- clean-examplePROGRAMS clean-generic clean-libtool clean-local \
- ctags 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-exampleDATA \
- install-examplePROGRAMS 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-sourceDATA 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 uninstall uninstall-am uninstall-exampleDATA \
- uninstall-examplePROGRAMS uninstall-sourceDATA
-
-
-#------------------------------------------------------------
-# File list for deb/ports packages
-#------------------------------------------------------------
-#lst:
-# echo $(ALL_SRC) > src.lst
-# echo $(EXTRA_DIST) > other.lst
-
-clean-local:
- rm -f *.bak *.rpo *.sym lib*.*_pure_* *.lst
- rm -f Makefile.old *core *~ *.so *.log
- rm -f $(example_PROGRAMS)
- rm -rf idl
-
-# 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:
Property changes on: trunk/OpenRTM-aist/src/ext/ec/logical_time
___________________________________________________________________
Added: svn:ignore
+ .deps
Makefile.in
Makefile
Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am 2012-04-06 06:15:08 UTC (rev 2350)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am 2012-04-09 03:40:14 UTC (rev 2351)
@@ -10,7 +10,7 @@
SUBDIRS = . example
IDLC = @IDLC@
-IDLFLAGS = @IDL_FLAGS@ -I$(top_srcdir)/src/lib/rtm/idl
+IDLFLAGS = @IDL_FLAGS@ -I../$(top_srcdir)/src/lib/rtm/idl
LIBS = @LIBS@
AM_CPPFLAGS=-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/coil/include -I$(top_srcdir)/src/lib/rtm/idl
@@ -26,16 +26,21 @@
.idlSkel.cpp:
echo $(PROVIDER_OBJ)
- $(IDLC) $(IDLFLAGS) $<
+ mkdir -p idl
+ cp $< idl/
+ (cd idl ; $(IDLC) $(IDLFLAGS) $< )
PYTHONPATH="$(top_srcdir)/build:$(PYTHONPATH)" \
PATH="$(top_srcdir)/utils/rtm-config:$(PATH)" \
- $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$<
+ $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$< --include-dir="idl/"
.idlStub.cpp:
- $(IDLC) $(IDLFLAGS) $<
+ echo $(PROVIDER_OBJ)
+ mkdir -p idl
+ cp $< idl/
+ (cd idl ; $(IDLC) $(IDLFLAGS) $< )
PYTHONPATH="$(PYTHONPATH):$(top_srcdir)/build" \
PATH="$(top_srcdir)/utils/rtm-config:$(PATH)" \
- $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$<
+ $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$< --include-dir="idl/"
#------------------------------------------------------------
# Source list
@@ -43,7 +48,7 @@
IDL_SOURCES = LogicalTimeTriggeredEC.idl
OBSERVER_DIST_SRC = LogicalTimeTriggeredEC.cpp
-OBSERVER_NODIST_SRC = $(IDL_SOURCES:.idl=Stub.cpp)
+OBSERVER_NODIST_SRC = idl/$(IDL_SOURCES:.idl=Stub.cpp)
OBSERVER_SRC = $(OBSERVER_DIST_SRC) $(OBSERVER_NODIST_SRC)
OBSERVER_DIST_H = $(OBSERVER_DIST_SRC:.cpp=.h)
@@ -145,6 +150,7 @@
clean_skelstub:
rm -f *Skel.h *Skel.cpp
rm -f *Stub.h *Stub.cpp
+ rm -rf idl
rm -f *.hh *SK.cc
rm -f *S.cpp *S.h *_T.cpp *_T.h *.inl
Property changes on: trunk/OpenRTM-aist/src/ext/ec/logical_time/example
___________________________________________________________________
Added: svn:ignore
+ .deps
Makefile.in
Makefile
Property changes on: trunk/OpenRTM-aist/src/ext/ec/rtpreempt
___________________________________________________________________
Modified: svn:ignore
- svn: warning: cannot set LC_CTYPE locale
svn: warning: environment variable LANG is JPN
svn: warning: please check that your locale name is correct
Makefile.in
+ svn: warning: cannot set LC_CTYPE locale
svn: warning: environment variable LANG is JPN
svn: warning: please check that your locale name is correct
Makefile.in
.deps
Makefile
Property changes on: trunk/OpenRTM-aist/src/ext/local_service
___________________________________________________________________
Added: svn:ignore
+ Makefile.in
Makefile
Property changes on: trunk/OpenRTM-aist/src/ext/local_service/nameservice_file
___________________________________________________________________
Added: svn:ignore
+ .deps
Makefile.in
Makefile
Modified: trunk/OpenRTM-aist/src/ext/local_service/nameservice_file/FileNameservice.cpp
===================================================================
--- trunk/OpenRTM-aist/src/ext/local_service/nameservice_file/FileNameservice.cpp 2012-04-06 06:15:08 UTC (rev 2350)
+++ trunk/OpenRTM-aist/src/ext/local_service/nameservice_file/FileNameservice.cpp 2012-04-09 03:40:14 UTC (rev 2351)
@@ -404,8 +404,13 @@
NamingAction::preBind(RTC::RTObject_impl* rtobj, coil::vstring& name_)
{
coil::vstring name = name_;
+#ifndef ORB_IS_RTORB
CORBA::Object_var objref =
RTC::RTObject::_duplicate(rtobj->getObjRef());
+#else
+ RTC::RTObject_var objref =
+ RTC::RTObject::_duplicate(rtobj->getObjRef());
+#endif // ORB_IS_RTORB
CORBA::String_var ior =
RTC::Manager::instance().getORB()->object_to_string(objref);
coil::vstring ns_info;
Modified: trunk/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.cpp
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.cpp 2012-04-06 06:15:08 UTC (rev 2350)
+++ trunk/OpenRTM-aist/src/ext/sdo/observer/ComponentObserverConsumer.cpp 2012-04-09 03:40:14 UTC (rev 2351)
@@ -684,7 +684,12 @@
{
RTC::SdoServiceConsumerFactory& factory
= RTC::SdoServiceConsumerFactory::instance();
+#ifndef ORB_IS_RTORB
factory.addFactory(CORBA_Util::toRepositoryId<OpenRTM::ComponentObserver>(),
+#else
+ factory.addFactory(CORBA_Util::
+ toRepositoryIdOfObject<OpenRTM::ComponentObserver>(),
+#endif
::coil::Creator< ::RTC::SdoServiceConsumerBase,
::RTC::ComponentObserverConsumer>,
::coil::Destructor< ::RTC::SdoServiceConsumerBase,
Modified: trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2012-04-06 06:15:08 UTC (rev 2350)
+++ trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2012-04-09 03:40:14 UTC (rev 2351)
@@ -8,7 +8,7 @@
AUTOMAKE_OPTIONS = 1.9
IDLC = @IDLC@
-IDLFLAGS = @IDL_FLAGS@ -I$(top_srcdir)/src/lib/rtm/idl
+IDLFLAGS = @IDL_FLAGS@ -I../$(top_srcdir)/src/lib/rtm/idl
LIBS = @LIBS@
AM_CPPFLAGS=-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/coil/include -I$(top_srcdir)/src/lib/rtm/idl
@@ -24,16 +24,20 @@
.idlSkel.cpp:
echo $(PROVIDER_OBJ)
- $(IDLC) $(IDLFLAGS) $<
+ mkdir -p idl
+ cp $< idl/
+ (cd idl ; $(IDLC) $(IDLFLAGS) $< )
PYTHONPATH="$(top_srcdir)/build:$(PYTHONPATH)" \
PATH="$(top_srcdir)/utils/rtm-config:$(PATH)" \
- $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$<
+ $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$< --include-dir=idl/
.idlStub.cpp:
- $(IDLC) $(IDLFLAGS) $<
+ mkdir -p idl
+ cp $< idl/
+ (cd idl ; $(IDLC) $(IDLFLAGS) $< )
PYTHONPATH="$(PYTHONPATH):$(top_srcdir)/build" \
PATH="$(top_srcdir)/utils/rtm-config:$(PATH)" \
- $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$<
+ $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$< --include-dir=idl/
#------------------------------------------------------------
# Source list
@@ -41,7 +45,7 @@
IDL_SOURCES = ComponentObserver.idl
OBSERVER_DIST_SRC = ComponentObserverConsumer.cpp
-OBSERVER_NODIST_SRC = $(IDL_SOURCES:.idl=Stub.cpp)
+OBSERVER_NODIST_SRC = idl/$(IDL_SOURCES:.idl=Stub.cpp)
OBSERVER_SRC = $(OBSERVER_DIST_SRC) $(OBSERVER_NODIST_SRC)
OBSERVER_DIST_H = $(OBSERVER_DIST_SRC:.cpp=.h)
@@ -143,6 +147,7 @@
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
Modified: trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.cpp 2012-04-06 06:15:08 UTC (rev 2350)
+++ trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextProfile.cpp 2012-04-09 03:40:14 UTC (rev 2351)
@@ -270,7 +270,12 @@
return RTC::RTC_ERROR;
}
Guard guard(m_profileMutex);
+#ifndef ORB_IS_RTORB
CORBA_SeqUtil::push_back(m_profile.participants, rtobj._retn());
+#else
+ CORBA_SeqUtil::push_back(m_profile.participants,
+ RTC::RTObject::_duplicate(rtobj.in()));
+#endif
return RTC::RTC_OK;
}
Modified: trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h 2012-04-06 06:15:08 UTC (rev 2350)
+++ trunk/OpenRTM-aist/src/lib/rtm/ExecutionContextWorker.h 2012-04-09 03:40:14 UTC (rev 2351)
@@ -138,7 +138,7 @@
*
* @endif
*/
- bool isRunning(void);
+ CORBA::Boolean isRunning(void);
/*!
* @if jp
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2012-04-06 06:15:08 UTC (rev 2350)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2012-04-09 03:40:14 UTC (rev 2351)
@@ -81,6 +81,15 @@
DataPortSkel.h \
ExtendedDataTypesSkel.h \
InterfaceDataTypesSkel.h
+DUMMY_STUBS = \
+ SDOPackageStub.h \
+ RTCStub.h \
+ OpenRTMStub.h \
+ ManagerStub.h \
+ BasicDataTypeStub.h \
+ DataPortStub.h \
+ ExtendedDataTypesStub.h \
+ InterfaceDataTypesStub.h
ORB_SRC = $(RTORB_SRC)
endif
@@ -170,8 +179,14 @@
$(top_srcdir)/build/makewrapper.py $$f ; \
done ;
@for f in $(DUMMY_SKELS) ; do \
+ echo cp OpenRTM-aistSkel.h $$f ; \
+ cp OpenRTM-aistStub.h $$f ; \
cp OpenRTM-aistSkel.h $$f ; \
- done
+ done ;
+ @for f in $(DUMMY_STUBS) ; do \
+ echo cp OpenRTM-aistSkel.h $$f ; \
+ cp OpenRTM-aistSkel.h $$f ; \
+ done ;
# Install directory of headers and idl files
@@ -263,6 +278,7 @@
# Cleanup
clean-local:
rm -f $(ALL_SRC) *~ *.core *.lst Makefile.old *.h *.c
+ rm -f OpenRTM-aist.idl
rm -f idl-stamp
# Extra sources included distribution
Modified: trunk/OpenRTM-aist/utils/rtm-skelwrapper/skel_wrapper.py
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-skelwrapper/skel_wrapper.py 2012-04-06 06:15:08 UTC (rev 2350)
+++ trunk/OpenRTM-aist/utils/rtm-skelwrapper/skel_wrapper.py 2012-04-09 03:40:14 UTC (rev 2351)
@@ -86,7 +86,7 @@
*
*/
-#include "[include_dir][skel_h]"
+#include "[skel_h]"
#if defined ORB_IS_TAO
# include "[include_dir][basename]C.cpp"
@@ -139,7 +139,7 @@
[config_inc]
#if defined ORB_IS_TAO
-# include "[include_dir][basename]C.h"
+# include "[basename]C.h"
#elif defined ORB_IS_OMNIORB
# if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
# undef USE_stub_in_nt_dll
@@ -175,7 +175,7 @@
*
*/
-#include "[include_dir][stub_h]"
+#include "[stub_h]"
#if defined ORB_IS_TAO
# include "[include_dir][basename]C.cpp"
openrtm-commit メーリングリストの案内