[openrtm-commit:03221] r3238 - in branches/RELENG_1_2/OpenRTM-aist/src: ext/ssl lib/rtm lib/rtm/idl

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2018-03-06 11:26:01 +0900 (Tue, 06 Mar 2018)
New Revision: 3238

Modified:
   branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/Makefile.am
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am
   branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
Log:
[build, ->trunk] Build bug fixed.

Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/Makefile.am	2018-03-06 02:04:52 UTC (rev 3237)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/Makefile.am	2018-03-06 02:26:01 UTC (rev 3238)
@@ -68,7 +68,7 @@
 	        --version $(RTM_VERSION)                        \
 	        --out $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj  \
 	        --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
-	        --source $(SSL_WIN_SRC) ;                       \
+	        --source $(SSL_WIN_SRC)
 	qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj
 
 vcxproj:

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am	2018-03-06 02:04:52 UTC (rev 3237)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/Makefile.am	2018-03-06 02:26:01 UTC (rev 3238)
@@ -239,7 +239,7 @@
 		--out $(win32_builddir)/rtm/libRTC_vc9.vcproj \
 		--yaml libRTC.vcproj.yaml \
 		--source $(RTC_SRC) ../ext/sdo/observer/ComponentObserverConsumer.cpp \
-		--header $(rtmheader_HEADERS) ../ext/sdo/observer/ComponentObserverConsumer.h ; 
+		--header $(rtmheader_HEADERS) ../ext/sdo/observer/ComponentObserverConsumer.h
 	qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc9.vcproj
 
 vcxproj: libRTC.vcproj.yaml
@@ -251,7 +251,7 @@
 			--out $(win32_builddir)/rtm/libRTC_vc$${ver}.vcxproj \
 			--yaml libRTC.vcproj.yaml \
 			--source $(RTC_SRC) ../ext/sdo/observer/ComponentObserverConsumer.cpp \
-			--header $(rtmheader_HEADERS) ../ext/sdo/observer/ComponentObserverConsumer.h ; 
+			--header $(rtmheader_HEADERS) ../ext/sdo/observer/ComponentObserverConsumer.h ; \
 		qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc$${ver}.vcxproj ; \
 	done
 

Modified: branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am	2018-03-06 02:04:52 UTC (rev 3237)
+++ branches/RELENG_1_2/OpenRTM-aist/src/lib/rtm/idl/Makefile.am	2018-03-06 02:26:01 UTC (rev 3238)
@@ -232,7 +232,7 @@
 		--out $(win32_builddir)/rtm/idl/libRTCSkel_vc9.vcproj \
 		--yaml libRTCSkel.vcproj.yaml \
 		--source $(SKEL_CPP) ComponentObserverSkel.cpp \
-		--header $(SKEL_H) ComponentObserverSkel.h ; 
+		--header $(SKEL_H) ComponentObserverSkel.h
 	qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc9.vcproj
 
 vcxproj: libRTCSkel.vcproj.yaml
@@ -244,8 +244,8 @@
 			--out $(win32_builddir)/rtm/idl/libRTCSkel_vc$${ver}.vcxproj \
 			--yaml libRTCSkel.vcproj.yaml \
 			--source $(SKEL_CPP) ComponentObserverSkel.cpp \
-			--header $(SKEL_H) ComponentObserverSkel.h ; 
-		qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc$${ver}.vcxproj ;
+			--header $(SKEL_H) ComponentObserverSkel.h ; \
+		qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc$${ver}.vcxproj ; \
 	done
 
 dist-hook: lst vcproj