[openrtm-commit:01100] r2396 - trunk/OpenRTM-aist/src/ext/sdo/observer

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2013-06-03 18:03:35 +0900 (Mon, 03 Jun 2013)
New Revision: 2396

Modified:
   trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
Log:
[compat,win32] Stub/Skel file pathes in vcxproj for Windows have unnecessary idl/ prefix. Removed. refs #2700

Modified: trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am	2013-05-31 07:20:34 UTC (rev 2395)
+++ trunk/OpenRTM-aist/src/ext/sdo/observer/Makefile.am	2013-06-03 09:03:35 UTC (rev 2396)
@@ -46,11 +46,15 @@
 
 OBSERVER_DIST_SRC   = ComponentObserverConsumer.cpp
 OBSERVER_NODIST_SRC = idl/$(IDL_SOURCES:.idl=Stub.cpp)
+OBSERVER_NDWIN_SRC   = $(IDL_SOURCES:.idl=Stub.cpp)
 OBSERVER_SRC        = $(OBSERVER_DIST_SRC) $(OBSERVER_NODIST_SRC)
+OBSERVER_WIN_SRC     = $(OBSERVER_DIST_SRC) $(OBSERVER_NDWIN_SRC)
 
 OBSERVER_DIST_H     = $(OBSERVER_DIST_SRC:.cpp=.h)
 OBSERVER_NODIST_H   = $(OBSERVER_NODIST_SRC:.cpp=.h)
+OBSERVER_NODWIN_H    = $(OBSERVER_NODWIN_SRC:.cpp=.h)
 OBSERVER_H          = $(OBSERVER_DIST_H) $(OBSERVER_NODIST_H)
+OBSERVER_WIN_H       = $(OBSERVER_DIST_H) $(OBSERVER_NOWIN__H)
 
 #------------------------------------------------------------
 # Object list
@@ -109,8 +113,8 @@
 		--version $(RTM_VERSION)                        \
 		--out $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj  \
 		--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
-		--source $(OBSERVER_SRC)                        \
-		--header $(OBSERVER_H)
+		--source $(OBSERVER_WIN_SRC)                        \
+		--header $(OBSERVER_WIN_H)
 	qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj
 
 vc9proj:
@@ -121,8 +125,8 @@
 		--version $(RTM_VERSION)                        \
 		--out $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj  \
 		--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
-		--source $(OBSERVER_SRC)                        \
-		--header $(OBSERVER_H)
+		--source $(OBSERVER_WIN_SRC)                        \
+		--header $(OBSERVER_WIN_H)
 	qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj
 
 vc10proj:
@@ -133,8 +137,8 @@
 		--version $(RTM_VERSION)                          \
 		--out $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj \
 		--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml  \
-		--source $(OBSERVER_SRC)                          \
-		--header $(OBSERVER_H)
+		--source $(OBSERVER_WIN_SRC)                          \
+		--header $(OBSERVER_WIN_H)
 	qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj