[openrtm-commit:01954] r2734 - trunk/OpenRTM-aist/src/lib/rtm/ext

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2016-05-25 14:58:10 +0900 (Wed, 25 May 2016)
New Revision: 2734

Modified:
   trunk/OpenRTM-aist/src/lib/rtm/ext/Makefile.am
Log:
[compat,build,->RELENG_1_1] Dist source and installation location has been modified.

Modified: trunk/OpenRTM-aist/src/lib/rtm/ext/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ext/Makefile.am	2016-05-25 05:57:04 UTC (rev 2733)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/Makefile.am	2016-05-25 05:58:10 UTC (rev 2734)
@@ -147,23 +147,25 @@
 		$(MAKE) $(AM_MAKEFLAGS) idl-stamp ; \
 	fi ;
 
+#------------------------------------------------------------
 # Install directory of headers and idl files
+#------------------------------------------------------------
 rtmheaderdir = $(rtm_includedir)/rtm
-idldir =       $(rtmheaderdir)/idl
-rtmskeldir =   $(rtmheaderdir)/idl
+idldir =       $(rtmheaderdir)/ext
+extskeldir =   $(rtmheaderdir)/ext
 
 idl_DATA = $(IDL_SOURCES)
+nodist_extskel_HEADERS = $(ALL_SRC)
 
-nodist_rtmskel_HEADERS = $(ALL_SRC) 
-
 #------------------------------------------------------------
-
+# libraries
+#------------------------------------------------------------
 lib_LTLIBRARIES = \
 	librtmManipulator.la \
 	librtmCamera.la
 
-librtmManipulator_la_SOURCES = $(MANIPULATORSKEL_CPP)
-librtmCamera_la_SOURCES = $(CAMERASKEL_CPP)
+nodist_librtmManipulator_la_SOURCES = $(MANIPULATORSKEL_CPP)
+nodist_librtmCamera_la_SOURCES = $(CAMERASKEL_CPP)
 
 librtmManipulator_la_LIBADD = $(LIBS) -lRTC
 librtmCamera_la_LIBADD = $(LIBS) -lRTC