[openrtm-commit:01966] r2740 - in branches/RELENG_1_1/OpenRTM-aist: . examples/Composite examples/ExtTrigger examples/SimpleIO

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-05-26 10:21:08 +0900 (Thu, 26 May 2016)
New Revision: 2740

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/examples/Composite/Makefile.am
   branches/RELENG_1_1/OpenRTM-aist/examples/ExtTrigger/Makefile.am
   branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am
Log:
[merge] r2738-2739 have been merged from trunk.


Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715-2721,2724,2728-2730,2733-2734
   + /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715-2721,2724,2728-2730,2733-2734,2738-2739

Modified: branches/RELENG_1_1/OpenRTM-aist/examples/Composite/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/Composite/Makefile.am	2016-05-26 00:55:08 UTC (rev 2739)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/Composite/Makefile.am	2016-05-26 01:21:08 UTC (rev 2740)
@@ -41,7 +41,7 @@
 
 # Standalone RTCs
 example_PROGRAMS = ControllerComp MotorComp SensorComp Composite
-example_DATA = rtc.conf composite.conf
+example_DATA = rtc.conf composite.conf rtc.composite.linux.conf
 
 ControllerComp_SOURCES = ControllerComp.cpp 
 ControllerComp_DEPENDENCIES = Controller.la
@@ -86,7 +86,8 @@
 	README.Motor        \
 	README.Sensor       \
 	rtc.conf            \
-	composite.conf
+	composite.conf      \
+	rtc.composite.linux.conf
 
 ALL_SRC =                  \
 	ControllerComp.cpp \

Modified: branches/RELENG_1_1/OpenRTM-aist/examples/ExtTrigger/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/ExtTrigger/Makefile.am	2016-05-26 00:55:08 UTC (rev 2739)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/ExtTrigger/Makefile.am	2016-05-26 01:21:08 UTC (rev 2740)
@@ -20,7 +20,7 @@
 
 # Standalone RTCs
 example_PROGRAMS = ConsoleInCompExt ConsoleOutCompExt ConnectorCompExt
-example_DATA = rtc.conf rtc.conf.org
+example_DATA = rtc.conf
 
 ConsoleInCompExt_SOURCES = ConsoleInComp.cpp ConsoleIn.cpp ConsoleIn.h
 ConsoleInCompExt_LDADD   = $(top_builddir)/src/lib/rtm/libRTC.la \
@@ -50,8 +50,7 @@
 	Makefile.ConsoleOut \
 	README.ConsoleIn    \
 	README.ConsoleOut   \
-	rtc.conf            \
-	rtc.conf.org
+	rtc.conf            
 
 ALL_SRC =                  \
 	ConsoleInComp.cpp  \

Modified: branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am	2016-05-26 00:55:08 UTC (rev 2739)
+++ branches/RELENG_1_1/OpenRTM-aist/examples/SimpleIO/Makefile.am	2016-05-26 01:21:08 UTC (rev 2740)
@@ -36,7 +36,7 @@
 # Standalone RTCs
 example_PROGRAMS = ConsoleInComp ConsoleOutComp
 noinst_PROGRAMS = ConnectorComp
-example_DATA = rtc.conf consin.conf consout.conf component.conf rtc.conf.org
+example_DATA = rtc.conf consin.conf consout.conf component.conf
 
 ConsoleInComp_SOURCES = ConsoleInComp.cpp 
 ConsoleInComp_DEPENDENCIES = ConsoleIn.la
@@ -73,8 +73,7 @@
 	rtc.conf            \
 	consin.conf         \
 	consout.conf        \
-	component.conf      \
-	rtc.conf.org
+	component.conf      
 
 ALL_SRC =                  \
 	ConsoleInComp.cpp  \