[openrtm-commit:00168] r2179 - in trunk/OpenRTM-aist/src/ext: . sdo sdo/logger

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2011-06-06 10:37:25 +0900 (Mon, 06 Jun 2011)
New Revision: 2179

Modified:
   trunk/OpenRTM-aist/src/ext/
   trunk/OpenRTM-aist/src/ext/sdo/Makefile.am
   trunk/OpenRTM-aist/src/ext/sdo/logger/Makefile.am
Log:
r2178 merged.



Property changes on: trunk/OpenRTM-aist/src/ext
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/RELENG_1_1/OpenRTM-aist/src/ext:2126-2150,2178

Modified: trunk/OpenRTM-aist/src/ext/sdo/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/Makefile.am	2011-06-06 01:28:00 UTC (rev 2178)
+++ trunk/OpenRTM-aist/src/ext/sdo/Makefile.am	2011-06-06 01:37:25 UTC (rev 2179)
@@ -7,6 +7,6 @@
 
 AUTOMAKE_OPTIONS = 1.4
 
-SUBDIRS = observer logger
+SUBDIRS = observer
 
 

Modified: trunk/OpenRTM-aist/src/ext/sdo/logger/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/logger/Makefile.am	2011-06-06 01:28:00 UTC (rev 2178)
+++ trunk/OpenRTM-aist/src/ext/sdo/logger/Makefile.am	2011-06-06 01:37:25 UTC (rev 2179)
@@ -66,7 +66,7 @@
 
 socomp_LTLIBRARIES = LoggerConsumer.la
 
-nodist_LoggerConsumer_la_SOURCES = \
+dist_LoggerConsumer_la_SOURCES = \
 	$(LOGGER_DIST_SRC) $(LOGGER_DIST_H)
 LoggerConsumer_la_LDFLAGS = -module
 LoggerConsumer_la_DEPENDENCIES = libLoggerStub.la