[openrtm-commit:02034] r2773 - in branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist: examples/Fsm hrtm hrtm/idls

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2016-10-07 16:43:42 +0900 (Fri, 07 Oct 2016)
New Revision: 2773

Modified:
   branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/examples/Fsm/Makefile.am
   branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/hrtm/Makefile.am
   branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/hrtm/idls/Makefile.am
Log:
[FSM4RTC,2.0,compat] Some Makefile.am bugs are fixed.

Modified: branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/examples/Fsm/Makefile.am
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/examples/Fsm/Makefile.am	2016-10-07 07:34:06 UTC (rev 2772)
+++ branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/examples/Fsm/Makefile.am	2016-10-07 07:43:42 UTC (rev 2773)
@@ -6,19 +6,16 @@
 ##---------------------------------------------------------------------------
 clean-local:
 	rm -rf Debug Release
-	rm -rf *~ *.cpp *.h *.idl rtc.conf
+	rm -rf *~ *.cc *.cpp *.h *.idl *.conf 
 	rm -rf *.vcproj *.vcxproj *.user *.ncb *.suo
 	rm -rf FsmComp
 
 src:
-	cp -p $(top_srcdir)/examples/Fsm/*.cpp .
 	cp -p $(top_srcdir)/examples/Fsm/*.cc .
 	cp -p $(top_srcdir)/examples/Fsm/*.h .
-	cp -p $(top_srcdir)/examples/Fsm/*.hpp .
-	cp -p $(top_srcdir)/examples/Fsm/rtc.conf .
-	qkc -O- -ms *.cpp
+	cp -p $(top_srcdir)/examples/Fsm/CMakeLists.txt .
+	cp -p $(top_srcdir)/examples/Fsm/*.conf .
 	qkc -O- -ms *.cc
 	qkc -O- -ms *.h
-	qkc -O- -ms *.hpp
 
 dist-hook: src

Modified: branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/hrtm/Makefile.am
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/hrtm/Makefile.am	2016-10-07 07:34:06 UTC (rev 2772)
+++ branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/hrtm/Makefile.am	2016-10-07 07:43:42 UTC (rev 2773)
@@ -8,7 +8,7 @@
 
 clean-local:
 	rm -rf Debug Release
-	rm -f *~ *.cpp *.h *.cc *.hh version.txt
+	rm -f *~ *.cpp *.h *.cc *.hh
 	rm -f *.sln *.suo *.ncb *.user *.vcproj *.vcxproj *.def
 
 src:

Modified: branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/hrtm/idls/Makefile.am
===================================================================
--- branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/hrtm/idls/Makefile.am	2016-10-07 07:34:06 UTC (rev 2772)
+++ branches/FSM4RTC/OpenRTM-aist/win32/OpenRTM-aist/hrtm/idls/Makefile.am	2016-10-07 07:43:42 UTC (rev 2773)
@@ -11,9 +11,7 @@
 	rm -f *.sln *.suo *.ncb *.user *.vcproj *.vcxproj *.def
 
 src:
-	cp -p $(top_srcdir)/src/lib/hrtm/idls/*.cpp .
 	cp -p $(top_srcdir)/src/lib/hrtm/idls/*.h .
-	qkc -O- -ms *.cpp
 	qkc -O- -ms *.h
 
 dist-hook: src