[openrtm-commit:01322] r2514 - trunk/OpenRTM-aist/src/ext/ec/logical_time

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2014-03-03 15:47:58 +0900 (Mon, 03 Mar 2014)
New Revision: 2514

Modified:
   trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
Log:
[compat] Makefile.am has been updated for parallel compile.

Modified: trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am	2014-03-03 06:47:45 UTC (rev 2513)
+++ trunk/OpenRTM-aist/src/ext/ec/logical_time/Makefile.am	2014-03-03 06:47:58 UTC (rev 2514)
@@ -24,23 +24,25 @@
 WRAPPER  = $(top_builddir)/utils/rtm-skelwrapper/rtm-skelwrapper
 WRAPPER_FLAGS = --include-dir="" --skel-suffix=Skel --stub-suffix=Stub
 
-.idlSkel.cpp:
-	echo $(PROVIDER_OBJ)
+idl-stamp: $(IDL_SOURCES)
+	@touch idl-stamp
 	mkdir -p idl
-	cp $< idl/
-	(cd idl ; $(IDLC) $(IDLFLAGS) $< )
-	PYTHONPATH="$(top_srcdir)/build:$(PYTHONPATH)" \
-	PATH="$(top_srcdir)/utils/rtm-config:$(PATH)"  \
-	$(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$< --include-dir="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:
-	echo $(PROVIDER_OBJ)
-	mkdir -p idl
-	cp $< idl/
-	(cd idl ; $(IDLC) $(IDLFLAGS) $< )
-	PYTHONPATH="$(PYTHONPATH):$(top_srcdir)/build" \
-	PATH="$(top_srcdir)/utils/rtm-config:$(PATH)"  \
-	$(WRAPPER) $(WRAPPER_FLAGS) --idl-file=$< --include-dir="idl/"
+$(ALL_SRC): idl-stamp
+	@if test -f $@ ; then \
+		touch $@ ; \
+	else \
+		rm -f idl-stamp ; \
+		$(MAKE) $(AM_MAKEFLAGS) idl-stamp ; \
+	fi ;
 
 #------------------------------------------------------------
 # Source list
@@ -48,8 +50,8 @@
 IDL_SOURCES = LogicalTimeTriggeredEC.idl
 
 OBSERVER_DIST_SRC   = LogicalTimeTriggeredEC.cpp
-OBSERVER_NODIST_SRC = idl/$(IDL_SOURCES:.idl=Stub.cpp)
-OBSERVER_NDWIN_SRC  = $(IDL_SOURCES:.idl=Stub.cpp)
+OBSERVER_NODIST_SRC = $(IDL_SOURCES:.idl=Stub.cpp) $(IDL_SOURCES:.idl=Skel.cpp)
+OBSERVER_NDWIN_SRC  = $(IDL_SOURCES:.idl=Stub.cpp) $(IDL_SOURCES:.idl=Skel.cpp)
 OBSERVER_SRC        = $(OBSERVER_DIST_SRC) $(OBSERVER_NODIST_SRC)
 OBSERVER_WIN_SRC    = $(OBSERVER_DIST_SRC) $(OBSERVER_NDWIN_SRC)
 
@@ -80,7 +82,7 @@
 dist_LogicalTimeTriggeredEC_la_SOURCES = \
 	$(OBSERVER_DIST_SRC) $(OBSERVER_DIST_H)
 LogicalTimeTriggeredEC_la_LDFLAGS = -module
-LogicalTimeTriggeredEC_la_DEPENDENCIES = libLogicalTimeTriggeredECStub.la
+LogicalTimeTriggeredEC_la_DEPENDENCIES = libLogicalTimeTriggeredECSkel.la
 LogicalTimeTriggeredEC_la_LIBADD  =                 \
 	libLogicalTimeTriggeredECStub.la            \
 	$(top_builddir)/src/lib/rtm/libRTC.la       \
@@ -161,4 +163,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