[openrtm-commit:00037] r2085 - in trunk/OpenRTM-aist: . docs examples/AutoTest examples/Composite examples/ConfigSample examples/ExtTrigger examples/SeqIO examples/SimpleIO examples/SimpleService examples/Templates examples/tests src/ext/ec/artlinux src/ext/ec/rtpreempt src/ext/sdo/logger src/ext/sdo/observer src/lib/coil src/lib/rtm src/lib/rtm/idl src/lib/rtm/tests/Manager src/lib/rtm/tests/ManagerServant src/lib/rtm/tests/ModuleManager src/lib/rtm/tests/SystemLogger utils/rtc-link utils/rtc-template utils/rtm-config utils/rtm-manager utils/rtm-skelwrapper
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 5月 7日 (土) 10:06:22 JST
Author: n-ando
Date: 2011-05-07 10:06:21 +0900 (Sat, 07 May 2011)
New Revision: 2085
Modified:
trunk/OpenRTM-aist/configure.ac
trunk/OpenRTM-aist/docs/Makefile.am
trunk/OpenRTM-aist/examples/AutoTest/Makefile.am
trunk/OpenRTM-aist/examples/Composite/Makefile.am
trunk/OpenRTM-aist/examples/ConfigSample/Makefile.am
trunk/OpenRTM-aist/examples/ExtTrigger/Makefile.am
trunk/OpenRTM-aist/examples/SeqIO/Makefile.am
trunk/OpenRTM-aist/examples/SimpleIO/Makefile.am
trunk/OpenRTM-aist/examples/SimpleService/Makefile.am
trunk/OpenRTM-aist/examples/Templates/Makefile.am
trunk/OpenRTM-aist/examples/tests/Makefile.am
trunk/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am
trunk/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am
trunk/OpenRTM-aist/src/ext/sdo/logger/Makefile.am
trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
trunk/OpenRTM-aist/src/lib/coil/configure.ac
trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/tests/SystemLogger/Makefile.am
trunk/OpenRTM-aist/utils/rtc-link/Makefile.am
trunk/OpenRTM-aist/utils/rtc-template/Makefile.am
trunk/OpenRTM-aist/utils/rtm-config/Makefile.am
trunk/OpenRTM-aist/utils/rtm-config/openrtm-aist.pc.in
trunk/OpenRTM-aist/utils/rtm-manager/Makefile.am
trunk/OpenRTM-aist/utils/rtm-skelwrapper/Makefile.am
Log:
New variable for installation directory (rtm_includedir/rtm_libdir/rtm_datadir)
have been added for new installation policy. refs #2096
Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/configure.ac 2011-05-07 01:06:21 UTC (rev 2085)
@@ -1077,6 +1077,7 @@
dnl omniORB setup complete
dnl ------------------------------------------------------------
PATH_NORM($omniidl)
+ PATH_NORM($omniNames)
IDLC=$n_path
IDL_FLAGS="-bcxx -Wba -nf"
COSNAMES=$omniNames
@@ -1527,13 +1528,30 @@
AC_SUBST(RTPREEMPTEC)
dnl OpenRTM's includedir/libdir/datadir definition
-rtmlibdir=$libdir"/openrtm-"$major_version"."$minor_version
-rtmdatadir=$datadir"/openrtm-"$major_version"."$minor_version
-rtmincludedir=$includedir"/openrtm-"$major_version"."$minor_version
-AC_SUBST(rtmlibdir)
-AC_SUBST(rtmdatadir)
-AC_SUBST(rtmincludedir)
+rtm_includedir=$includedir"/openrtm-"$major_version"."$minor_version
+rtm_libdir=$libdir"/openrtm-"$major_version"."$minor_version
+rtm_datadir=$datadir"/openrtm-"$major_version"."$minor_version
+dnl under lib/openrtm-x.y directories
+rtm_rtcdir=$rtm_libdir"/rtc"
+rtm_ecdir=$rtm_libdir"/ec"
+rtm_rtmdir=$rtm_libdir"/rtm"
+rtm_svcdir=$rtm_libdir"/svc"
+rtm_sdodir=$rtm_libdir"/sdo"
+rtm_docdir=$rtm_datadir"/doc"
+rtm_exampledir=$rtm_datadir"/example"
+
+AC_SUBST(rtm_libdir)
+AC_SUBST(rtm_datadir)
+AC_SUBST(rtm_includedir)
+AC_SUBST(rtm_rtcdir)
+AC_SUBST(rtm_ecdir)
+AC_SUBST(rtm_rtmdir)
+AC_SUBST(rtm_svcdir)
+AC_SUBST(rtm_sdodir)
+AC_SUBST(rtm_docdir)
+AC_SUBST(rtm_exampledir)
+
dnl ------------------------------------------------------------
UNIQUE($CPPFLAGS)
@@ -1582,9 +1600,9 @@
echo 'IDLC: '$IDLC
echo 'IDL_FLAGS: '$IDL_FLAGS
echo ''
-echo 'include dir: '$rtmincludedir
-echo 'lib dir: '$rtmlibdir
-echo 'data dir: '$rtmdatadir
+echo 'include dir: '$rtm_includedir
+echo 'lib dir: '$rtm_libdir
+echo 'data dir: '$rtm_datadir
echo '------------------------------------------------------------'
echo ''
Modified: trunk/OpenRTM-aist/docs/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/docs/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/docs/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -25,7 +25,7 @@
#DevelopersGuide.pdf:
# make -f Makefile.docs DevelopersGuide.pdf
-docsdir = $(pkgdatadir)
+docdir = $(rtm_docdir)
EXTRA_DIST = \
ClassReference \
@@ -38,48 +38,48 @@
#install-manual:
# $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/docs/
# if test -f DevelopersGuide.ps; then \
-# $(INSTALL_DATA) DevelopersGuide.ps $(DESTDIR)$(pkgdatadir)/docs/; \
+# $(INSTALL_DATA) DevelopersGuide.ps $(rtm_docdir); \
# fi
# if test -f DevelopersGuide.pdf; then \
-# $(INSTALL_DATA) DevelopersGuide.pdf $(DESTDIR)$(pkgdatadir)/docs/; \
+# $(INSTALL_DATA) DevelopersGuide.pdf $(rtm_docdir); \
# fi
install-class-reference:
if test -d ClassReference; then \
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/docs/ClassReference/html; \
+ $(mkinstalldirs) $(rtm_docdir)/ClassReference/html; \
for x in ClassReference/html/*; do \
if test -f $$x; then \
- $(INSTALL_DATA) $$x $(DESTDIR)$(pkgdatadir)/docs/ClassReference/html/;\
+ $(INSTALL_DATA) $$x $(rtm_docdir)/ClassReference/html/;\
fi \
done \
fi
install-class-reference-en:
if test -d ClassReference-en; then \
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/docs/ClassReference-en/html; \
+ $(mkinstalldirs) $(rtm_docdir)/ClassReference-en/html; \
for x in ClassReference-en/html/*; do \
if test -f $$x; then \
- $(INSTALL_DATA) $$x $(DESTDIR)$(pkgdatadir)/docs/ClassReference-en/html/;\
+ $(INSTALL_DATA) $$x $(rtm_docdir)/ClassReference-en/html/;\
fi \
done \
fi
install-idl-reference:
if test -d IDLReference; then \
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/docs/IDLReference/html; \
+ $(mkinstalldirs) $(rtm_docdir)/IDLReference/html; \
for x in IDLReference/html/*; do \
if test -f $$x; then \
- $(INSTALL_DATA) $$x $(DESTDIR)$(pkgdatadir)/docs/IDLReference/html/;\
+ $(INSTALL_DATA) $$x $(rtm_docdir)/IDLReference/html/;\
fi \
done \
fi
install-idl-reference-en:
if test -d IDLReference-en; then \
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/docs/IDLReference-en/html; \
+ $(mkinstalldirs) $(rtm_docdir)/IDLReference-en/html; \
for x in IDLReference-en/html/*; do \
if test -f $$x; then \
- $(INSTALL_DATA) $$x $(DESTDIR)$(pkgdatadir)/docs/IDLReference-en/html/;\
+ $(INSTALL_DATA) $$x $(rtm_docdir)/IDLReference-en/html/;\
fi \
done \
fi
Modified: trunk/OpenRTM-aist/examples/AutoTest/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/AutoTest/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/examples/AutoTest/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -68,8 +68,8 @@
# Targets
#------------------------------------------------------------
# Targets directories
-exampledir = $(pkgdatadir)/examples
-socompdir = $(exampledir)/rtcs
+exampledir = $(rtm_exampledir)
+socompdir = $(exampledir)/rtc
sourcedir = $(exampledir)/src/AutoTest
# Loadable RTCs
Modified: trunk/OpenRTM-aist/examples/Composite/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/Composite/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/examples/Composite/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -14,8 +14,8 @@
# Targets
#------------------------------------------------------------
# Targets directories
-exampledir = $(pkgdatadir)/examples
-socompdir = $(exampledir)/rtcs
+exampledir = $(rtm_exampledir)
+socompdir = $(exampledir)/rtc
sourcedir = $(exampledir)/src/Composite
# Loadable RTCs
Modified: trunk/OpenRTM-aist/examples/ConfigSample/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/ConfigSample/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/examples/ConfigSample/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -14,8 +14,8 @@
# Targets
#------------------------------------------------------------
# Targets directories
-exampledir = $(pkgdatadir)/examples
-socompdir = $(exampledir)/rtcs
+exampledir = $(rtm_exampledir)
+socompdir = $(exampledir)/rtc
sourcedir = $(exampledir)/src/ConfigSample
# Loadable RTCs
Modified: trunk/OpenRTM-aist/examples/ExtTrigger/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/examples/ExtTrigger/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -14,8 +14,8 @@
# Targets
#------------------------------------------------------------
# Targets directories
-exampledir = $(pkgdatadir)/examples
-socompdir = $(exampledir)/rtcs
+exampledir = $(rtm_exampledir)
+socompdir = $(exampledir)/rtc
sourcedir = $(exampledir)/src/ExtTrigger
# Standalone RTCs
Modified: trunk/OpenRTM-aist/examples/SeqIO/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/SeqIO/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/examples/SeqIO/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -14,9 +14,9 @@
# Targets
#------------------------------------------------------------
# Targets directories
-exampledir = $(pkgdatadir)/examples
-socompdir = $(exampledir)/rtcs
-sourcedir = $(exampledir)/src/SeqIO
+exampledir = $(rtm_exampledir)
+socompdir = $(rtm_exampledir)/rtc
+sourcedir = $(rtm_exampledir)/src/SeqIO
# Loadable RTCs
socomp_LTLIBRARIES = SeqIn.la SeqOut.la
Modified: trunk/OpenRTM-aist/examples/SimpleIO/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/SimpleIO/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/examples/SimpleIO/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -14,8 +14,8 @@
# Targets
#------------------------------------------------------------
# Targets directories
-exampledir = $(pkgdatadir)/examples
-socompdir = $(exampledir)/rtcs
+exampledir = $(rtm_exampledir)
+socompdir = $(exampledir)/rtc
sourcedir = $(exampledir)/src/SimpleIO
# Loadable RTCs
Modified: trunk/OpenRTM-aist/examples/SimpleService/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/SimpleService/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/examples/SimpleService/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -68,8 +68,8 @@
# Targets
#------------------------------------------------------------
# Targets directories
-exampledir = $(pkgdatadir)/examples
-socompdir = $(exampledir)/rtcs
+exampledir = $(rtm_exampledir)
+socompdir = $(exampledir)/rtc
sourcedir = $(exampledir)/src/SimpleService
# Loadable RTCs
@@ -113,7 +113,14 @@
# Example sources
-source_DATA = $(ALL_SRC) $(EXTRA_DIST)
+source_DATA = \
+ $(EXTRA_DIST) \
+ $(PROVIDER_DIST_H) \
+ $(PROVIDER_DIST_SRC) \
+ $(CONSUMER_DIST_H) \
+ $(CONSUMER_DIST_SRC) \
+ MyServiceProviderComp.cpp \
+ MyServiceConsumerComp.cpp
#------------------------------------------------------------
# Extra distributed files
Modified: trunk/OpenRTM-aist/examples/Templates/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/Templates/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/examples/Templates/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -45,7 +45,7 @@
VelocityControl3D.xml
# Install directory of headers and idl files
-exampledir = $(pkgdatadir)/examples
+exampledir = $(rtm_exampledir)
templatedir = $(exampledir)/templates/
template_DATA = $(TEMPLATES)
Modified: trunk/OpenRTM-aist/examples/tests/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/examples/tests/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/examples/tests/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -26,7 +26,7 @@
tests:
# Something to install to libdir
-pymoduledir = $(pkglibdir)/tests
+pymoduledir = $(rtm_libdir)/tests
pymodule_SCRIPTS = \
$(PY_STUBS) \
$(TESTS_SOURCES)
Modified: trunk/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/src/ext/ec/artlinux/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -14,7 +14,7 @@
# Targets
#------------------------------------------------------------
# Targets directories
-moduledir = $(pkgdatadir)/modules
+moduledir = $(rtm_ecdir)
module_LTLIBRARIES = ArtExecutionContext.la
Modified: trunk/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/src/ext/ec/rtpreempt/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -12,7 +12,7 @@
# Targets
#------------------------------------------------------------
# Targets directories
-moduledir = $(pkgdatadir)/modules/ec
+moduledir = $(rtm_ecdir)
module_LTLIBRARIES = RTPreemptEC.la
Modified: trunk/OpenRTM-aist/src/ext/sdo/logger/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/logger/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/src/ext/sdo/logger/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -57,8 +57,7 @@
# Targets
#------------------------------------------------------------
# Targets directories
-moduledir = $(pkgdatadir)/modules
-socompdir = $(moduledir)/extmodules
+socompdir = $(rtm_sdodir)
# Loadable Module
noinst_LTLIBRARIES = libLoggerSkel.la libLoggerStub.la
Modified: trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -57,8 +57,7 @@
# Targets
#------------------------------------------------------------
# Targets directories
-moduledir = $(pkgdatadir)/modules
-socompdir = $(moduledir)/extmodules
+socompdir = $(rtm_sdodir)
# Loadable Module
noinst_LTLIBRARIES = libComponentObserverSkel.la libComponentObserverStub.la
Modified: trunk/OpenRTM-aist/src/lib/coil/configure.ac
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/configure.ac 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/src/lib/coil/configure.ac 2011-05-07 01:06:21 UTC (rev 2085)
@@ -18,7 +18,7 @@
dnl ------------------------------------------------------------
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT(coil, 1.0, n-ando at aist.go.jp, coil)
+AC_INIT(coil, 1.1, n-ando at aist.go.jp, coil)
AC_CONFIG_AUX_DIR([.])
AM_INIT_AUTOMAKE([dist-bzip2 tar-pax])
AM_CONFIG_HEADER([include/coil/config_coil.h])
Modified: trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/src/lib/rtm/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -118,11 +118,10 @@
libRTC_la_LDFLAGS = \
-no-undefined \
-L$(top_builddir)/src/lib/rtm/idl \
- -release $(PACKAGE_VERSION) \
- -version-info 0:4:0
+ -release $(PACKAGE_VERSION)
-rtmheaderdir = $(prefix)/include/rtm
+rtmheaderdir = $(rtm_includedir)/rtm
rtmheader_HEADERS = \
$(libRTC_la_SOURCES:.cpp=.h) \
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -175,7 +175,7 @@
# Install directory of headers and idl files
-rtmheaderdir = $(prefix)/include/rtm
+rtmheaderdir = $(rtm_includedir)/rtm
idldir = $(rtmheaderdir)/idl
rtmskeldir = $(rtmheaderdir)/idl
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/Manager/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -36,11 +36,7 @@
$(top_srcdir)/src/lib/rtm/idl/BasicDataType.idl \
$(top_srcdir)/src/lib/rtm/idl/DataPort.idl
-#
-#
-#
-dummylibdir = $(pkgdatadir)/src/lib/rtm/tests/Manager
-dummylib_LTLIBRARIES = DummyLib.la
+noinst_LTLIBRARIES = DummyLib.la DummyModule.la DummyModule2.la
nodist_DummyLib_la_SOURCES = \
$(IDL_SOURCES:.idl=Skel.cpp) \
$(top_srcdir)/src/lib/rtm/NVUtil.cpp \
@@ -121,11 +117,11 @@
#
#
#
-socompdir = $(pkgdatadir)/src/lib/rtm/tests/Manager
+#socompdir = $(pkgdatadir)/src/lib/rtm/tests/Manager
# Loadable RTCs
#socomp_LTLIBRARIES = ConsoleIn.la ConsoleOut.la
-socomp_LTLIBRARIES = DummyModule.la DummyModule2.la
+#noinst_LTLIBRARIES = DummyModule.la DummyModule2.la
nodist_DummyModule_la_SOURCES = DummyModule.h \
$(top_srcdir)/src/lib/rtm/DataFlowComponentBase.cpp \
@@ -136,7 +132,7 @@
-lomniORB4 \
-lomnithread \
-lomniDynamic4 \
- -lcoil \
+ -lcoil \
-luuid \
$(top_builddir)/src/lib/rtm/tests/Manager/.libs/DummyLib.la
@@ -149,7 +145,7 @@
-lomniORB4 \
-lomnithread \
-lomniDynamic4 \
- -lcoil \
+ -lcoil \
-luuid \
$(top_builddir)/src/lib/rtm/tests/Manager/.libs/DummyLib.la
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/ManagerServant/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -46,8 +46,8 @@
$(top_builddir)/src/lib/rtm/idl/DataPort.idl \
$(top_builddir)/src/lib/rtm/idl/Manager.idl
-dummylibdir = $(pkgdatadir)/src/lib/rtm/tests/ManagerServant
-dummylib_LTLIBRARIES = DummyLib.la
+#dummylibdir = $(pkgdatadir)/src/lib/rtm/tests/ManagerServant
+noinst_LTLIBRARIES = DummyLib.la DummyModule1.la DummyModule2.la
nodist_DummyLib_la_SOURCES = \
$(IDL_SOURCES:.idl=Skel.cpp) \
$(top_builddir)/src/lib/rtm/NVUtil.cpp \
@@ -125,11 +125,11 @@
TEST_H =
-socompdir = $(pkgdatadir)/src/lib/rtm/tests/ManagerServant
+#socompdir = $(pkgdatadir)/src/lib/rtm/tests/ManagerServant
# Loadable RTCs
#socomp_LTLIBRARIES = ConsoleIn.la ConsoleOut.la
-socomp_LTLIBRARIES = DummyModule1.la DummyModule2.la
+#noinst_LTLIBRARIES = DummyModule1.la DummyModule2.la
nodist_DummyModule1_la_SOURCES = DummyModule1.h \
$(top_builddir)/src/lib/rtm/DataFlowComponentBase.cpp \
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/ModuleManager/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -38,8 +38,8 @@
$(top_srcdir)/src/lib/rtm/idl/BasicDataType.idl \
$(top_srcdir)/src/lib/rtm/idl/DataPort.idl
-dummylibdir = $(pkgdatadir)/src/lib/rtm/tests/ModuleManager
-dummylib_LTLIBRARIES = DummyLib.la
+#dummylibdir = $(pkgdatadir)/src/lib/rtm/tests/ModuleManager
+noinst_LTLIBRARIES = DummyLib.la DummyModule1.la
nodist_DummyLib_la_SOURCES = \
$(IDL_SOURCES:.idl=Skel.cpp) \
$(top_builddir)/src/lib/rtm/NVUtil.cpp \
@@ -118,10 +118,10 @@
TEST_SRC = $(ModuleManagerTests_SOURCES)
TEST_H =
-socompdir = $(pkgdatadir)/src/lib/rtm/tests/ModuleManager
+#socompdir = $(pkgdatadir)/src/lib/rtm/tests/ModuleManager
# Loadable RTCs
-socomp_LTLIBRARIES = DummyModule1.la
+#noinst_LTLIBRARIES = DummyModule1.la
nodist_DummyModule1_la_SOURCES = DummyModule1.h \
$(top_builddir)/src/lib/rtm/DataFlowComponentBase.cpp \
Modified: trunk/OpenRTM-aist/src/lib/rtm/tests/SystemLogger/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/tests/SystemLogger/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/src/lib/rtm/tests/SystemLogger/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -104,7 +104,7 @@
#
#
#
-socompdir = $(pkgdatadir)/src/lib/rtm/tests/SystemLogger
+#socompdir = $(pkgdatadir)/src/lib/rtm/tests/SystemLogger
Modified: trunk/OpenRTM-aist/utils/rtc-link/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/utils/rtc-link/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/utils/rtc-link/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -26,7 +26,7 @@
rtc-link:
# Something to install to libdir
-pymoduledir = $(pkglibdir)/rtc-link
+pymoduledir = $(rtm_libdir)/rtc-link
pymodule_SCRIPTS = \
$(PY_STUBS) \
$(RTCLINK_SOURCES)
Modified: trunk/OpenRTM-aist/utils/rtc-template/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/utils/rtc-template/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/utils/rtc-template/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -18,7 +18,7 @@
rtc-template:
-pyhelperdir = $(pkglibdir)/py_helper
+pyhelperdir = $(rtm_libdir)/py_helper
pyhelper_SCRIPTS = \
yat.py \
Modified: trunk/OpenRTM-aist/utils/rtm-config/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-config/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/utils/rtm-config/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -27,9 +27,9 @@
echo 'rtm_prefix="'${prefix}'"' >> $@
echo 'rtm_exec_prefix="'${exec_prefix}'"' >> $@
echo 'rtm_cxx="'${CXX}'"' >> $@
- echo 'rtm_cflags="'${CXXFLAGS}' -I'${prefix}'/include -I'${prefix}'/include/rtm/idl"' >> $@
+ echo 'rtm_cflags="'${CXXFLAGS}' -I'${prefix}'/include -I'${rtm_includedir}' -I'${rtm_includedir}'/rtm/idl"' >> $@
echo 'rtm_libs="'${LDFLAGS}' -L'${prefix}'/lib '${LIBS}' -lRTC -lcoil"' >> $@
- echo 'rtm_libdir="'${pkglibdir}'"' >> $@
+ echo 'rtm_libdir="'${rtm_libdir}'"' >> $@
echo 'rtm_version="'${RTM_VERSION}'"' >> $@
echo 'rtm_orb="'${ORB}'"' >> $@
echo 'rtm_idlc="'${IDLC}'"' >> $@
@@ -42,6 +42,6 @@
openrtm-aist.pc.in
clean-local:
- rm -f libRTM.pc
+ rm -f openrtm-aist.pc
rm -f rtm-config
rm -rf *~ *core
Modified: trunk/OpenRTM-aist/utils/rtm-config/openrtm-aist.pc.in
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-config/openrtm-aist.pc.in 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/utils/rtm-config/openrtm-aist.pc.in 2011-05-07 01:06:21 UTC (rev 2085)
@@ -5,7 +5,7 @@
rtm_prefix=@prefix@
rtm_exec_prefix=@exec_prefix@
rtm_cxx=@CXX@
-rtm_cflags=@CXXFLAGS@ -I${prefix}/include -I${prefix}/include/rtm/idl
+rtm_cflags=@CXXFLAGS@ -I${prefix}/include -I at rtm_includedir@ -I at rtm_includedir@/rtm/idl
rtm_libs=@LDFLAGS@ -L${prefix}/lib @LIBS@ -lRTC -lcoil
rtm_libdir=@pkglibdir@
rtm_version=@RTM_VERSION@
@@ -16,6 +16,6 @@
Name: @PACKAGE@
Description: @RTM_DESCRIPTION@
Version: @RTM_VERSION@
-Requires:
+Requires:
Libs: ${rtm_libs}
Cflags: ${rtm_cflags}
Modified: trunk/OpenRTM-aist/utils/rtm-manager/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-manager/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/utils/rtm-manager/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -19,7 +19,7 @@
SUFFIXES = .idl _idl.py
-managerhelperdir = $(pkglibdir)/manager_helper
+managerhelperdir = $(rtm_libdir)/manager_helper
managerhelper_SCRIPTS = \
NSHelper.py \
Modified: trunk/OpenRTM-aist/utils/rtm-skelwrapper/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/utils/rtm-skelwrapper/Makefile.am 2011-05-06 15:56:05 UTC (rev 2084)
+++ trunk/OpenRTM-aist/utils/rtm-skelwrapper/Makefile.am 2011-05-07 01:06:21 UTC (rev 2085)
@@ -12,7 +12,7 @@
all:
chmod 755 rtm-skelwrapper
-pyhelperdir = $(pkglibdir)/py_helper
+pyhelperdir = $(rtm_libdir)/py_helper
pyhelper_SCRIPTS = skel_wrapper.py
openrtm-commit メーリングリストの案内