[openrtm-commit:02383] r2920 - in trunk/OpenRTM-aist: . utils/cmake

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-02-06 14:12:21 +0900 (Mon, 06 Feb 2017)
New Revision: 2920

Modified:
   trunk/OpenRTM-aist/configure.ac
   trunk/OpenRTM-aist/utils/cmake/Makefile.am
Log:
[compat,bugfix,->RELENG_1_2] Fixed r2914. refs #3889

Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac	2017-02-03 07:56:00 UTC (rev 2919)
+++ trunk/OpenRTM-aist/configure.ac	2017-02-06 05:12:21 UTC (rev 2920)
@@ -243,8 +243,6 @@
 	LDFLAGS="-L$lpath $LDFLAGS"
 done
 
-LIBS="$LIBS -lrtmCamera -lrtmManipulator"
-
 dnl this is needed for creating libraries using libtool
 dnl AC_LIBTOOL_WIN32_DLL
 dnl AC_LIBLTDL_CONVENIENCE

Modified: trunk/OpenRTM-aist/utils/cmake/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/utils/cmake/Makefile.am	2017-02-03 07:56:00 UTC (rev 2919)
+++ trunk/OpenRTM-aist/utils/cmake/Makefile.am	2017-02-06 05:12:21 UTC (rev 2920)
@@ -85,7 +85,7 @@
 	${rtm_includedir}/rtm/idl
 OPENRTM_LDFLAGS_=`echo "${LDFLAGS}" | sed -e 's/\-L[^ ]*//g'`
 OPENRTM_LIBRARY_DIRS=${prefix}/lib
-OPENRTM_LIBRARIES_=`echo ${LIBS} RTC coil | sed -e 's/\-l\([^ ]*\)/\1/g'`
+OPENRTM_LIBRARIES_=`echo ${LIBS} RTC coil rtmCamera rtmManipulator | sed -e 's/\-l\([^ ]*\)/\1/g'`
 
 # OpenRTM-aist specific directory
 COIL_INCLUDE_DIR=${coil_includedir}