[openrtm-commit:03224] r3241 - in branches/RELENG_1_2/OpenRTM-aist/src/ext: sdo/observer ssl
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2018年 3月 6日 (火) 11:59:59 JST
Author: miyamoto
Date: 2018-03-06 11:59:59 +0900 (Tue, 06 Mar 2018)
New Revision: 3241
Modified:
branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/Makefile.am
Log:
[build,bugfix,->trunk] Build bug fixed.
Modified: branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am
===================================================================
--- branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2018-03-06 02:46:47 UTC (rev 3240)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/sdo/observer/Makefile.am 2018-03-06 02:59:59 UTC (rev 3241)
@@ -1,50 +1,116 @@
## -*- Makefile -*-
##---------------------------------------------------------------------------
-## Makefile.am for external libraries
+## Makefile.am for ART-Linux execution context
##
-## $Id$
+## $Id: Makefile.am 1429 2009-07-06 08:28:25Z hakuta $
##---------------------------------------------------------------------------
-AUTOMAKE_OPTIONS = 1.4
+AUTOMAKE_OPTIONS = 1.9
-AM_CPPFLAGS= \
- -I$(top_srcdir)/src/lib \
- -I$(top_srcdir)/src/lib/coil/include \
- -I$(top_srcdir)/src/lib/rtm/idl
+IDLC = @IDLC@
+IDLFLAGS = @IDL_FLAGS@ -I../$(top_srcdir)/src/lib/rtm/idl
+LIBS = @LIBS@
-AM_LDFLAGS= \
- -L$(top_builddir) \
- -L$(top_builddir)/src/lib/rtm \
- -L$(top_builddir)/src/lib/rtm/idl
+AM_CPPFLAGS=-I$(top_srcdir)/src/lib -I$(top_srcdir)/src/lib/coil/include -I$(top_srcdir)/src/lib/rtm/idl
+AM_LDFLAGS=-L$(top_builddir) -L$(top_builddir)/src/lib/rtm -L$(top_builddir)/src/lib/rtm/idl
+#------------------------------------------------------------
+# Some rules for IDL compile
+#------------------------------------------------------------
+SUFFIXES = .o .so .idl Skel.cpp Stub.cpp Stub.o Skel.o
-SSL_SRC = SSLTransport.cpp
-SSL_WIN_SRC = SSLTransport.cpp
+WRAPPER = $(top_builddir)/utils/rtm-skelwrapper/rtm-skelwrapper
+WRAPPER_FLAGS = --include-dir="" --skel-suffix=Skel --stub-suffix=Stub
-SSL_H =
-SSL_WIN_H =
+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 ;
+$(ALL_SRC): idl-stamp
+ @if test -f $@ ; then \
+ touch $@ ; \
+ else \
+ rm -f idl-stamp ; \
+ $(MAKE) $(AM_MAKEFLAGS) idl-stamp ; \
+ fi ;
+
#------------------------------------------------------------
+# Source list
+#------------------------------------------------------------
+IDL_SOURCES = ComponentObserver.idl
+
+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
+#------------------------------------------------------------
+OBSERVER_OBJ=$(OBSERVER_DIST_SRC:.cpp=.o)
+
+#------------------------------------------------------------
# Targets
#------------------------------------------------------------
# Targets directories
-socompdir = $(rtm_ssldir)
+socompdir = $(rtm_sdodir)
-socomp_LTLIBRARIES = SSLTransport.la
+#------------------------------
+# Static link library for linked in libRTC.so
+if ENABLE_OBSERVER
+noinst_LTLIBRARIES = \
+ libComponentObserverStub.la \
+ libComponentObserverConsumer.la
+nodist_libComponentObserverStub_la_SOURCES = $(IDL_SOURCES:.idl=Stub.cpp)
+nodist_libComponentObserverConsumer_la_SOURCES = \
+ $(OBSERVER_DIST_SRC) $(OBSERVER_DIST_H)
+nodist_libComponentObserverConsumer_la_LDFLAGS = -module
+nodist_libComponentObserverConsumer_la_DEPENDENCIES = \
+ libComponentObserverStub.la
+nodist_libComponentObserverConsumer_la_LIBADD = \
+ libComponentObserverStub.la
+else
+#------------------------------
+# Loadable Module
+noinst_LTLIBRARIES = libComponentObserverStub.la
+nodist_libComponentObserverStub_la_SOURCES = $(IDL_SOURCES:.idl=Stub.cpp)
+socomp_LTLIBRARIES = ComponentObserverConsumer.la
-SSLTransport_la_SOURCES = $(SSL_SRC)
-SSLTransport_la_LDFLAGS = -module -shared
-SSLTransport_la_LIBADD = \
- $(top_builddir)/src/lib/rtm/libRTC.la \
+dist_ComponentObserverConsumer_la_SOURCES = \
+ $(OBSERVER_DIST_SRC) $(OBSERVER_DIST_H)
+ComponentObserverConsumer_la_LDFLAGS = -module
+ComponentObserverConsumer_la_DEPENDENCIES = libComponentObserverStub.la
+ComponentObserverConsumer_la_LIBADD = \
+ libComponentObserverStub.la \
+ $(top_builddir)/src/lib/rtm/libRTC.la \
$(top_builddir)/src/lib/coil/lib/libcoil.la
+endif
+#------------------------------
-clean-local:
- rm -rf *~ *.o *.so
+#------------------------------------------------------------
+# Extra distributed files
+#------------------------------------------------------------
+EXTRA_DIST = $(IDL_SOURCES)
+ALL_SRC = $(OBSERVER_SRC)
-
#------------------------------------------------------------
# File list for deb/ports packages
#------------------------------------------------------------
@@ -55,8 +121,8 @@
#------------------------------------------------------------
# Visual Studio Project
#------------------------------------------------------------
-win32_builddir=$(top_builddir)/win32/OpenRTM-aist/ext/ssl
-PROJNAME=SSLTransport
+win32_builddir=$(top_builddir)/win32/OpenRTM-aist/ext/sdo/observer
+PROJNAME=ComponentObserverConsumer
vcproj: vc9proj vcxproj
@@ -63,26 +129,28 @@
vc9proj:
$(top_builddir)/build/vcprojtool.py vcproj \
--type DLL \
- --vcversion "9.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(SSL_WIN_SRC)
+ --vcversion "9.00" \
+ --projectname "$(PROJNAME)" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source $(OBSERVER_WIN_SRC) \
+ --header $(OBSERVER_WIN_H)
qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc9.vcproj
vcxproj:
for ver in $(VC_VERSION); do \
- $(top_builddir)/build/vcxprojtool.py vcxproj \
- --type DLL \
- --vcversion "$${ver}.00" \
- --projectname "$(PROJNAME)" \
- --version $(RTM_VERSION) \
- --out $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj \
- --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(SSL_WIN_SRC) ; \
+ $(top_builddir)/build/vcxprojtool.py vcxproj \
+ --type DLL \
+ --vcversion "$${ver}.00" \
+ --projectname "$(PROJNAME)" \
+ --version $(RTM_VERSION) \
+ --out $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj \
+ --yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
+ --source $(OBSERVER_WIN_SRC) \
+ --header $(OBSERVER_WIN_H) ; \
qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj ; \
- done
+ done
dist-hook: lst vcproj
@@ -90,8 +158,15 @@
clean_objs:
rm -f $(OBJS)
+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-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: 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:46:47 UTC (rev 3240)
+++ branches/RELENG_1_2/OpenRTM-aist/src/ext/ssl/Makefile.am 2018-03-06 02:59:59 UTC (rev 3241)
@@ -80,7 +80,7 @@
--version $(RTM_VERSION) \
--out $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj \
--yaml $(top_builddir)/examples/rtcdll.vcproj.yaml \
- --source $(SSL_WIN_SRC) ;
+ --source $(SSL_WIN_SRC) ; \
qkc -O- -sm $(win32_builddir)/$(PROJNAME)Dll_vc$${ver}.vcxproj ; \
done
More information about the openrtm-commit
mailing list