[openrtm-commit:01326] r2518 - in tags/RELEASE_1_1_0/OpenRTM-aist: . examples/SimpleService src/ext/sdo/observer src/lib/coil/posix/coil utils/rtm-config
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 3月 3日 (月) 15:59:38 JST
Author: n-ando
Date: 2014-03-03 15:59:38 +0900 (Mon, 03 Mar 2014)
New Revision: 2518
Modified:
tags/RELEASE_1_1_0/OpenRTM-aist/
tags/RELEASE_1_1_0/OpenRTM-aist/examples/SimpleService/Makefile.am
tags/RELEASE_1_1_0/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
tags/RELEASE_1_1_0/OpenRTM-aist/src/lib/coil/posix/coil/Makefile.am
tags/RELEASE_1_1_0/OpenRTM-aist/utils/rtm-config/Makefile.am
Log:
[merge] r2512-2513, r2515-2516 (Makefile.am for parallel compile) have been merged.
Property changes on: tags/RELEASE_1_1_0/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/RELENG_1_1/OpenRTM-aist:2371
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213
+ /branches/RELENG_1_1/OpenRTM-aist:2371
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2512-2513,2515-2516
Modified: tags/RELEASE_1_1_0/OpenRTM-aist/examples/SimpleService/Makefile.am
===================================================================
--- tags/RELEASE_1_1_0/OpenRTM-aist/examples/SimpleService/Makefile.am 2014-03-03 06:57:40 UTC (rev 2517)
+++ tags/RELEASE_1_1_0/OpenRTM-aist/examples/SimpleService/Makefile.am 2014-03-03 06:59:38 UTC (rev 2518)
@@ -22,18 +22,22 @@
WRAPPER = $(top_builddir)/utils/rtm-skelwrapper/rtm-skelwrapper
WRAPPER_FLAGS = --include-dir="" --skel-suffix=Skel --stub-suffix=Stub
-.idlSkel.cpp:
- echo $(PROVIDER_OBJ)
- $(IDLC) $(IDLFLAGS) $<
- PYTHONPATH="$(top_srcdir)/build:$(PYTHONPATH)" \
- PATH="$(top_srcdir)/utils/rtm-config:$(PATH)" \
- $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$<
+idl-stamp: $(IDL_SOURCES)
+ @touch idl-stamp
+ @for f in $(IDL_SOURCES) ; do \
+ $(IDLC) $(IDLFLAGS) $$f ; \
+ PYTHONPATH="$(top_srcdir)/build:$(PYTHONPATH)" \
+ PATH="$(top_srcdir)/utils/rtm-config:$(PATH)" \
+ $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$$f ; \
+ done ;
-.idlStub.cpp:
- $(IDLC) $(IDLFLAGS) $<
- PYTHONPATH="$(PYTHONPATH):$(top_srcdir)/build" \
- PATH="$(top_srcdir)/utils/rtm-config:$(PATH)" \
- $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$<
+$(ALL_SRC): idl-stamp
+ @if test -f $@ ; then \
+ touch $@ ; \
+ else \
+ rm -f idl-stamp ; \
+ $(MAKE) $(AM_MAKEFLAGS) idl-stamp ; \
+ fi ;
#------------------------------------------------------------
# Source list
@@ -74,8 +78,8 @@
# Loadable RTCs
noinst_LTLIBRARIES = libMyServiceSkel.la libMyServiceStub.la
-nodist_libMyServiceSkel_la_SOURCES = $(PROVIDER_NODIST_SRC)
-nodist_libMyServiceStub_la_SOURCES = $(CONSUMER_NODIST_SRC)
+nodist_libMyServiceSkel_la_SOURCES = $(PROVIDER_NODIST_SRC) $(PROVIDER_NODIST_H)
+nodist_libMyServiceStub_la_SOURCES = $(CONSUMER_NODIST_SRC) $(CONSUMER_NODIST_H)
socomp_LTLIBRARIES = MyServiceProvider.la MyServiceConsumer.la
@@ -293,4 +297,5 @@
clean-local: clean_objs clean_skelstub
rm -f *.bak *.rpo *.sym lib*.*_pure_*
rm -f *.lst *core *~ *loT *.log
- rm -f Makefile.old
+ rm -f Makefile.old
+ rm -f idl-stamp
Modified: tags/RELEASE_1_1_0/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
===================================================================
--- tags/RELEASE_1_1_0/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2014-03-03 06:57:40 UTC (rev 2517)
+++ tags/RELEASE_1_1_0/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2014-03-03 06:59:38 UTC (rev 2518)
@@ -8,7 +8,7 @@
AUTOMAKE_OPTIONS = 1.9
IDLC = @IDLC@
-IDLFLAGS = @IDL_FLAGS@ -I$(top_srcdir)/src/lib/rtm/idl
+IDLFLAGS = @IDL_FLAGS@ -I../$(top_srcdir)/src/lib/rtm/idl
LIBS = @LIBS@
AM_CPPFLAGS=-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/coil/include -I$(top_srcdir)/src/lib/rtm/idl
@@ -22,18 +22,25 @@
WRAPPER = $(top_builddir)/utils/rtm-skelwrapper/rtm-skelwrapper
WRAPPER_FLAGS = --include-dir="" --skel-suffix=Skel --stub-suffix=Stub
-.idlSkel.cpp:
- echo $(PROVIDER_OBJ)
- $(IDLC) $(IDLFLAGS) $<
- PYTHONPATH="$(top_srcdir)/build:$(PYTHONPATH)" \
- PATH="$(top_srcdir)/utils/rtm-config:$(PATH)" \
- $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$<
+idl-stamp: $(IDL_SOURCES)
+ @touch idl-stamp
+ mkdir -p idl
+ (cd $(top_builddir)/utils/rtm-config; $(MAKE))
+ @for f in $(IDL_SOURCES) ; do \
+ cp $$f idl/ ; \
+ (cd idl ; $(IDLC) $(IDLFLAGS) $$f ; cd ..) ; \
+ PYTHONPATH="$(top_srcdir)/build:$(PYTHONPATH)" \
+ PATH="$(top_srcdir)/utils/rtm-config:$(PATH)" \
+ $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$$f --include-dir=idl/ ; \
+ done ;
-.idlStub.cpp:
- $(IDLC) $(IDLFLAGS) $<
- PYTHONPATH="$(PYTHONPATH):$(top_srcdir)/build" \
- PATH="$(top_srcdir)/utils/rtm-config:$(PATH)" \
- $(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$<
+$(ALL_SRC): idl-stamp
+ @if test -f $@ ; then \
+ touch $@ ; \
+ else \
+ rm -f idl-stamp ; \
+ $(MAKE) $(AM_MAKEFLAGS) idl-stamp ; \
+ fi ;
#------------------------------------------------------------
# Source list
@@ -42,11 +49,15 @@
OBSERVER_DIST_SRC = ComponentObserverConsumer.cpp
OBSERVER_NODIST_SRC = $(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
@@ -60,9 +71,8 @@
socompdir = $(rtm_sdodir)
# Loadable Module
-noinst_LTLIBRARIES = libComponentObserverSkel.la libComponentObserverStub.la
-nodist_libComponentObserverSkel_la_SOURCES = $(IDL_SOURCES:.idl=Skel.cpp)
-nodist_libComponentObserverStub_la_SOURCES = $(IDL_SOURCES:.idl=Stub.cpp)
+noinst_LTLIBRARIES = libComponentObserverStub.la
+nodist_libComponentObserverStub_la_SOURCES = $(IDL_SOURCES:.idl=Stub.cpp)
socomp_LTLIBRARIES = ComponentObserverConsumer.la
@@ -105,9 +115,9 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj \
--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(OBSERVER_SRC) \
- --header $(OBSERVER_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj
+ --source $(OBSERVER_WIN_SRC) \
+ --header $(OBSERVER_WIN_H)
+ qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc8.vcproj
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
@@ -117,9 +127,9 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj \
--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(OBSERVER_SRC) \
- --header $(OBSERVER_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj
+ --source $(OBSERVER_WIN_SRC) \
+ --header $(OBSERVER_WIN_H)
+ qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj
vc10proj:
$(top_builddir)/build/vcxprojtool.py vcxproj \
@@ -129,9 +139,9 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj \
--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(OBSERVER_SRC) \
- --header $(OBSERVER_H)
- qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj
+ --source $(OBSERVER_WIN_SRC) \
+ --header $(OBSERVER_WIN_H)
+ qkc -sm $(win32_builddir)/$(PROJNAME)Dll_vc10.vcxproj
dist-hook: lst vcproj
@@ -143,10 +153,12 @@
clean_skelstub:
rm -f *Skel.h *Skel.cpp
rm -f *Stub.h *Stub.cpp
+ rm -rf idl
rm -f *.hh *SK.cc
rm -f *C.cpp *C.h *S.cpp *S.h *_T.cpp *_T.h *.inl
clean-local: clean_objs clean_skelstub
rm -f *.bak *.rpo *.sym lib*.*_pure_*
rm -f *.lst *core *~ *loT *.log
- rm -f Makefile.old
+ rm -f Makefile.old
+ rm -rf idl-stamp
Modified: tags/RELEASE_1_1_0/OpenRTM-aist/src/lib/coil/posix/coil/Makefile.am
===================================================================
--- tags/RELEASE_1_1_0/OpenRTM-aist/src/lib/coil/posix/coil/Makefile.am 2014-03-03 06:57:40 UTC (rev 2517)
+++ tags/RELEASE_1_1_0/OpenRTM-aist/src/lib/coil/posix/coil/Makefile.am 2014-03-03 06:59:38 UTC (rev 2518)
@@ -63,12 +63,11 @@
COIL_H = $(COIL_COMMON_H) $(COIL_PLATFORM_H)
COIL_ALL = $(COIL_SRC) $(COIL_H)
-$(COIL_COMMON_SRC):
- cp -p $(top_srcdir)/common/*.cpp .
- cp -p $(top_srcdir)/common/*.h .
+$(COIL_COMMON_SRC): $(COIL_COMMON_H)
+ cp -p $(top_srcdir)/common/$@ .
$(COIL_COMMON_H):
- cp -p $(top_srcdir)/common/*.h .
+ cp -p $(top_srcdir)/common/$@ .
coilheaderdir = $(coil_includedir)/coil
Modified: tags/RELEASE_1_1_0/OpenRTM-aist/utils/rtm-config/Makefile.am
===================================================================
--- tags/RELEASE_1_1_0/OpenRTM-aist/utils/rtm-config/Makefile.am 2014-03-03 06:57:40 UTC (rev 2517)
+++ tags/RELEASE_1_1_0/OpenRTM-aist/utils/rtm-config/Makefile.am 2014-03-03 06:59:38 UTC (rev 2518)
@@ -21,7 +21,7 @@
bin_SCRIPTS = rtm-config
-all-local:
+all-local: rtm-config
chmod 755 rtm-config
EXTRA_DIST = \
More information about the openrtm-commit
mailing list