-# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG
-# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
+# Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
+
# This Makefile is responsible of generating the client and server
# implementation of IDL interfaces for both C++ and python usage.
# The building process of the C++ files is in charge of each source
# package and then is not manage here.
#
-
include $(top_srcdir)/salome_adm/unix/make_common_starter.am
-if WITH_PACO_PARALLEL
-MAKEFLAGS = -j1
-endif
-
-AM_CXXFLAGS = -fPIC
+AM_CXXFLAGS += -fPIC
BASEIDL_FILES = \
SALOME_Exception.idl \
SALOME_Registry.idl \
Logger.idl \
SALOME_GenericObj.idl \
+ SALOME_Types.idl \
SALOME_Session.idl \
SALOME_TestModuleCatalog.idl \
nstest.idl \
DSC_Engines.idl \
SALOME_Ports.idl \
- Calcium_Ports.idl \
- Palm_Ports.idl
+ SALOME_PyNode.idl \
+ Palm_Ports.idl \
+ SALOME_PACOExtension.idl \
+ SALOME_ParamPorts.idl
MPIIDL_FILES = \
SALOME_MPIObject.idl \
IDL_FILES += $(MPIIDL_FILES)
endif
+OTHER_IDL_FILES = \
+ TestNotif.idl \
+ TypeData.idl
+
# all the idl files are needed for make dist
-EXTRA_DIST= $(BASEIDL_FILES) $(MPIIDL_FILES) \
- SALOME_Component.xml DSC_Engines.xml SALOME_Ports.xml
+EXTRA_DIST= $(BASEIDL_FILES) $(MPIIDL_FILES) $(OTHER_IDL_FILES) \
+ SALOME_Component.xml DSC_Engines.xml SALOME_Ports.xml \
+ SALOME_PACOExtension.xml SALOME_ParamPorts.xml
# This variable defines the files to be installed
-salomeidl_DATA = $(IDL_FILES)
+salomeidl_DATA = $(IDL_FILES)
+nodist_salomeidl_DATA = Calcium_Ports.idl
# Sources built from idl files
# BUILT_SOURCE = first thing done on make all
SALOME_RegistrySK.cc \
LoggerSK.cc \
SALOME_GenericObjSK.cc \
+ SALOME_TypesSK.cc \
SALOME_SessionSK.cc \
SALOME_TestModuleCatalogSK.cc \
nstestSK.cc \
DSC_EnginesSK.cc \
SALOME_PortsSK.cc \
+ SALOME_PyNodeSK.cc \
Calcium_PortsSK.cc \
- Palm_PortsSK.cc
+ Palm_PortsSK.cc \
+ SALOME_PACOExtensionSK.cc \
+ SALOME_ParamPortsSK.cc
DYNIDL_SRCS = \
SALOME_PortsDynSK.cc Calcium_PortsDynSK.cc SALOME_ContainerManagerDynSK.cc \
SALOME_CommDynSK.cc SALOME_RegistryDynSK.cc SALOME_ModuleCatalogDynSK.cc \
SALOMEDSDynSK.cc SALOME_SessionDynSK.cc SALOME_RessourcesCatalogDynSK.cc \
- DSC_EnginesDynSK.cc SALOME_ComponentDynSK.cc SALOME_GenericObjDynSK.cc \
+ DSC_EnginesDynSK.cc SALOME_ComponentDynSK.cc SALOME_GenericObjDynSK.cc SALOME_TypesDynSK.cc \
Palm_PortsDynSK.cc SALOME_ExceptionDynSK.cc SALOMEDS_AttributesDynSK.cc \
- LoggerDynSK.cc
+ LoggerDynSK.cc SALOME_PACOExtensionDynSK.cc SALOME_ParamPortsDynSK.cc SALOME_PyNodeDynSK.cc
MPIIDL_SOURCES = \
SALOME_MPIObjectSK.cc \
STATIDL_SOURCES += $(MPIIDL_SOURCES)
endif
+if MPI_IS_OK
+ DYNIDL_SRCS += SALOME_MPIObjectDynSK.cc SALOME_MPIContainerDynSK.cc SALOME_TestMPIComponentDynSK.cc
+endif
+
$(DYNIDL_SRCS) : $(IDL_SOURCES)
# also install all generated headers to use result library from another modules
salomeinclude_DATA= $(STATIDL_SOURCES:%SK.cc=%.hh)
if WITH_PACO_PARALLEL
-PAR = SALOME_ExceptionPaCO.h SALOME_ExceptionPaCO.cc \
- SALOME_ComponentPaCO.h SALOME_ComponentPaCO.cc \
- SALOME_PortsPaCO.h SALOME_PortsPaCO.cc \
- DSC_EnginesPaCO.h DSC_EnginesPaCO.cc
+PAR = SALOME_ComponentPaCO.hxx SALOME_ComponentPaCO.cxx \
+ SALOME_PortsPaCO.hxx SALOME_PortsPaCO.cxx \
+ DSC_EnginesPaCO.hxx DSC_EnginesPaCO.cxx \
+ SALOME_PACOExtensionPaCO.hxx SALOME_PACOExtensionPaCO.cxx \
+ SALOME_ParamPortsPaCO.hxx SALOME_ParamPortsPaCO.cxx
+
+PAR_INCLUDES = SALOME_Exception.hxx SALOME_GenericObj.hxx SALOMEDS.hxx SALOME_PyNode.hxx
PAR_LIB = libSalomeParallelIDLKernel.la
-IDL_PACO = SALOME_ExceptionPaCO.idl SALOME_ComponentPaCO.idl SALOME_PortsPaCO.idl DSC_EnginesPaCO.idl
-
-GEN_PACO = SALOME_ComponentPaCO_Engines_Container_server.cc \
- SALOME_ComponentPaCO_Engines_Container_client.cc \
- SALOME_ComponentPaCO_Engines_Component_server.cc \
- SALOME_ComponentPaCO_Engines_Component_client.cc \
- SALOME_ComponentPaCO_Engines_Parallel_Component_server.cc \
- SALOME_ComponentPaCO_Engines_Parallel_Component_client.cc \
- SALOME_ComponentPaCO_Engines_fileTransfer_server.cc \
- SALOME_ComponentPaCO_Engines_fileTransfer_client.cc \
- SALOME_ComponentPaCO_Engines_Salome_file_server.cc \
- SALOME_ComponentPaCO_Engines_Salome_file_client.cc \
- SALOME_ComponentPaCO_Engines_Parallel_Salome_file_server.cc \
- SALOME_ComponentPaCO_Engines_Parallel_Salome_file_client.cc \
- SALOME_PortsPaCO_Ports_Port_server.cc \
- SALOME_PortsPaCO_Ports_Port_client.cc \
- DSC_EnginesPaCO_Engines_DSC_server.cc \
- DSC_EnginesPaCO_Engines_DSC_client.cc \
- DSC_EnginesPaCO_Engines_Superv_Component_server.cc \
- DSC_EnginesPaCO_Engines_Superv_Component_client.cc \
- DSC_EnginesPaCO_Engines_Parallel_DSC_server.cc \
- DSC_EnginesPaCO_Engines_Parallel_DSC_client.cc
-
-INCLUDES_PACO = SALOME_ComponentPaCO_Engines_Container_server.h \
- SALOME_ComponentPaCO_Engines_Container_client.h \
- SALOME_ComponentPaCO_Engines_Component_server.h \
- SALOME_ComponentPaCO_Engines_Component_client.h \
- SALOME_ComponentPaCO_Engines_Parallel_Component_server.h \
- SALOME_ComponentPaCO_Engines_Parallel_Component_client.h \
- SALOME_ComponentPaCO_Engines_fileTransfer_server.h \
- SALOME_ComponentPaCO_Engines_fileTransfer_client.h \
- SALOME_ComponentPaCO_Engines_Salome_file_server.h \
- SALOME_ComponentPaCO_Engines_Salome_file_client.h \
- SALOME_ComponentPaCO_Engines_Parallel_Salome_file_server.h \
- SALOME_ComponentPaCO_Engines_Parallel_Salome_file_client.h \
- SALOME_ExceptionPaCO.h \
- SALOME_ComponentPaCO.h \
- SALOME_Exception.h \
- SALOME_Component.h \
- SALOME_PortsPaCO_Ports_Port_server.h \
- SALOME_PortsPaCO_Ports_Port_client.h \
- SALOME_PortsPaCO.h \
- SALOME_Ports.h \
- DSC_EnginesPaCO_Engines_DSC_server.h \
- DSC_EnginesPaCO_Engines_DSC_client.h \
- DSC_EnginesPaCO_Engines_Superv_Component_server.h \
- DSC_EnginesPaCO_Engines_Superv_Component_client.h \
- DSC_EnginesPaCO_Engines_Parallel_DSC_server.h \
- DSC_EnginesPaCO_Engines_Parallel_DSC_client.h \
- DSC_EnginesPaCO.h \
- DSC_Engines.h
-
-XML = SALOME_Exception.xml SALOME_Component.xml DSC_Engines.xml SALOME_Ports.xml
+IDL_PACO = SALOME_ComponentPaCO.idl SALOME_PortsPaCO.idl DSC_EnginesPaCO.idl \
+ SALOME_ParamPortsPaCO.idl SALOME_PACOExtensionPaCO.idl
+
+GEN_PACO = SALOME_ComponentPaCO_Engines_Container_server.cxx \
+ SALOME_ComponentPaCO_Engines_Container_client.cxx \
+ SALOME_ComponentPaCO_Engines_Component_server.cxx \
+ SALOME_ComponentPaCO_Engines_Component_client.cxx \
+ SALOME_ComponentPaCO_Engines_fileTransfer_server.cxx \
+ SALOME_ComponentPaCO_Engines_fileTransfer_client.cxx \
+ SALOME_ComponentPaCO_Engines_Salome_file_server.cxx \
+ SALOME_ComponentPaCO_Engines_Salome_file_client.cxx \
+ SALOME_PortsPaCO_Ports_Port_server.cxx \
+ SALOME_PortsPaCO_Ports_Port_client.cxx \
+ SALOME_PortsPaCO_Ports_Data_Port_server.cxx \
+ SALOME_PortsPaCO_Ports_Data_Port_client.cxx \
+ DSC_EnginesPaCO_Engines_DSC_server.cxx \
+ DSC_EnginesPaCO_Engines_DSC_client.cxx \
+ DSC_EnginesPaCO_Engines_Superv_Component_server.cxx \
+ DSC_EnginesPaCO_Engines_Superv_Component_client.cxx \
+ SALOME_PACOExtensionPaCO_Engines_Parallel_Component_server.cxx \
+ SALOME_PACOExtensionPaCO_Engines_Parallel_Component_client.cxx \
+ SALOME_PACOExtensionPaCO_Engines_PACO_Container_server.cxx \
+ SALOME_PACOExtensionPaCO_Engines_PACO_Container_client.cxx \
+ SALOME_PACOExtensionPaCO_Engines_Parallel_Salome_file_server.cxx \
+ SALOME_PACOExtensionPaCO_Engines_Parallel_Salome_file_client.cxx \
+ SALOME_PACOExtensionPaCO_Engines_Parallel_DSC_server.cxx \
+ SALOME_PACOExtensionPaCO_Engines_Parallel_DSC_client.cxx \
+ SALOME_ParamPortsPaCO_Ports_Param_Double_Port_server.cxx \
+ SALOME_ParamPortsPaCO_Ports_Param_Double_Port_client.cxx
+
+INCLUDES_PACO = SALOME_ComponentPaCO_Engines_Container_server.hxx \
+ SALOME_ComponentPaCO_Engines_Container_client.hxx \
+ SALOME_ComponentPaCO_Engines_Component_server.hxx \
+ SALOME_ComponentPaCO_Engines_Component_client.hxx \
+ SALOME_ComponentPaCO_Engines_fileTransfer_server.hxx \
+ SALOME_ComponentPaCO_Engines_fileTransfer_client.hxx \
+ SALOME_ComponentPaCO_Engines_Salome_file_server.hxx \
+ SALOME_ComponentPaCO_Engines_Salome_file_client.hxx \
+ SALOME_ComponentPaCO.hxx \
+ SALOME_Component.hxx \
+ SALOME_PortsPaCO_Ports_Port_server.hxx \
+ SALOME_PortsPaCO_Ports_Port_client.hxx \
+ SALOME_PortsPaCO_Ports_Data_Port_server.hxx \
+ SALOME_PortsPaCO_Ports_Data_Port_client.hxx \
+ SALOME_PortsPaCO.hxx \
+ SALOME_Ports.hxx \
+ DSC_EnginesPaCO_Engines_DSC_server.hxx \
+ DSC_EnginesPaCO_Engines_DSC_client.hxx \
+ DSC_EnginesPaCO_Engines_Superv_Component_server.hxx \
+ DSC_EnginesPaCO_Engines_Superv_Component_client.hxx \
+ DSC_EnginesPaCO.hxx \
+ DSC_Engines.hxx \
+ SALOME_PACOExtensionPaCO_Engines_Parallel_Component_server.hxx \
+ SALOME_PACOExtensionPaCO_Engines_Parallel_Component_client.hxx \
+ SALOME_PACOExtensionPaCO_Engines_PACO_Container_server.hxx \
+ SALOME_PACOExtensionPaCO_Engines_PACO_Container_client.hxx \
+ SALOME_PACOExtensionPaCO_Engines_Parallel_Salome_file_server.hxx \
+ SALOME_PACOExtensionPaCO_Engines_Parallel_Salome_file_client.hxx \
+ SALOME_PACOExtensionPaCO_Engines_Parallel_DSC_server.hxx \
+ SALOME_PACOExtensionPaCO_Engines_Parallel_DSC_client.hxx \
+ SALOME_PACOExtensionPaCO.hxx \
+ SALOME_PACOExtension.hxx \
+ SALOME_ParamPortsPaCO_Ports_Param_Double_Port_server.hxx \
+ SALOME_ParamPortsPaCO_Ports_Param_Double_Port_client.hxx \
+ SALOME_ParamPortsPaCO.hxx \
+ SALOME_ParamPorts.hxx
+
+XML = SALOME_Component.xml DSC_Engines.xml SALOME_Ports.xml \
+ SALOME_PACOExtension.xml SALOME_ParamPorts.xml
endif
idldir = $(prefix)/idl/salome
-nodist_idl_DATA = ${XML} ${IDL_PACO}
+nodist_idl_DATA = ${XML} ${IDL_PACO} Calcium_Ports.idl
nodist_salomeinclude_HEADERS = ${INCLUDES_PACO}
-BUILT_SOURCES = $(IDL_SOURCES) $(PAR)
+BUILT_SOURCES = $(IDL_SOURCES) $(PAR_INCLUDES) $(PAR)
-SALOME_ExceptionPaCO.h SALOME_ExceptionPaCO.cc : SALOME_Exception.idl SALOME_Exception.xml
-SALOME_ComponentPaCO.h SALOME_ComponentPaCO.cc : SALOME_Component.idl SALOME_Component.xml
-SALOME_PortsPaCO.h SALOME_PortsPaCO.cc : SALOME_Ports.idl SALOME_Ports.xml
-DSC_EnginesPaCO.h DSC_EnginesPaCO.cc : DSC_Engines.idl DSC_Engines.xml
+SALOME_ComponentPaCO.idl SALOME_ComponentPaCO.hxx SALOME_ComponentPaCO.cxx : SALOME_Component.idl SALOME_Component.xml
+SALOME_PortsPaCO.idl SALOME_PortsPaCO.hxx SALOME_PortsPaCO.cxx : SALOME_Ports.idl SALOME_Ports.xml
+DSC_EnginesPaCO.idl DSC_EnginesPaCO.hxx DSC_EnginesPaCO.cxx : DSC_Engines.idl DSC_Engines.xml
+SALOME_PACOExtensionPaCO.idl SALOME_PACOExtensionPaCO.hxx SALOME_PACOExtensionPaCO.cxx : SALOME_PACOExtension.idl SALOME_PACOExtension.xml
+SALOME_ParamPortsPaCO.idl SALOME_ParamPortsPaCO.hxx SALOME_ParamPortsPaCO.cxx : SALOME_ParamPorts.idl SALOME_ParamPorts.xml
lib_LTLIBRARIES = libSalomeIDLKernel.la $(PAR_LIB)
nodist_libSalomeIDLKernel_la_SOURCES = $(IDL_SOURCES) $(DYNIDL_SRCS)
-libSalomeIDLKernel_la_CPPFLAGS =-I$(top_builddir)/salome_adm/unix \
- -I$(top_builddir)/idl \
+libSalomeIDLKernel_la_CPPFLAGS =-I$(top_builddir)/idl \
@CORBA_CXXFLAGS@ @CORBA_INCLUDES@
libSalomeIDLKernel_la_LDFLAGS = -no-undefined -version-info=0:0:0
libSalomeIDLKernel_la_LIBADD = @CORBA_LIBS@
libSalomeParallelIDLKernel_la_LIBADD = libSalomeIDLKernel.la @PACO_LIBS@
# These variables defines the building process of CORBA files
-OMNIORB_IDL = @OMNIORB_IDL@
-OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
-OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/salome/idl
-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -Wba -I$(top_builddir)/salome/idl
-IDLPYFLAGS = @IDLPYFLAGS@
+IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(srcdir) -I$(top_builddir)/salome/idl
+IDLPYFLAGS = @IDLPYFLAGS@ -I$(srcdir)
# potential problem on parallel make on the following - multiple outputs
SUFFIXES = .idl .hh SK.cc
.idlSK.cc:
- $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
+ $(IDL) $(IDLCXXFLAGS) $<
SK.cc.hh:
#Dummy rule to replace the following one (for parallel make)
#.idl.hh:
-# $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
+# $(IDL) $(IDLCXXFLAGS) $<
+
+if WITH_PACO_PARALLEL
-%PaCO.h %PaCO.cc : %.idl %.xml
- @PACO_IDL@ -I $(srcdir):@PACOPATH@/idl $^ omniORB4 0
+%PaCO.idl %PaCO.hxx %PaCO.cxx : %.idl %.xml
+ $(IDL) -p@PACOPATH@/lib/python -bpaco -Wb$(top_srcdir)/idl/$*.xml,$(srcdir):@PACOPATH@/idl $(top_srcdir)/idl/$*.idl
-install-exec-local: $(IDL_FILES:%=$(top_srcdir)/idl/%)
+.idl.hxx:
+ $(IDL) $(IDLCXXFLAGS) -Wbh=.hxx -Wbs=.cxx $<
+endif
+
+install-exec-local: $(IDL_FILES:%=$(top_srcdir)/idl/%) Calcium_Ports.idl
$(INSTALL) -d $(DESTDIR)$(salomepythondir)
ls $^ | while read file; do \
- $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \
+ $(IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \
+ done
+if WITH_PACO_PARALLEL
+ ls $(top_builddir)/idl/*.idl | while read file; do \
+ $(IDL) $(IDLPYFLAGS) -I$(top_srcdir)/idl -I@PACOPATH@/idl -C$(DESTDIR)$(salomepythondir) $$file ; \
done
+endif
# uninstall-local removes too much, but it works in distcheck
uninstall-local:
rm -rf $(DESTDIR)$(salomepythondir)/*
mostlyclean-local:
- -rm -f *.hh *.cc .depidl
+ -rm -f *.hh *.cc .depidl Calcium_Ports.idl
# we use cpp to generate dependencies between idl files.
# option x c tells the preprocessor to consider idl as a c file.
# if an idl is modified, all idl dependencies are rebuilt
-.depidl: $(IDL_FILES)
+.depidl: $(IDL_FILES) Calcium_Ports.idl
@echo "" > $@
@for dep in $^ dummy; do \
if [ $$dep != "dummy" ]; then \
-include .depidl
-CLEANFILES = *PaCO* *.h
+CLEANFILES = *PaCO* *.hxx *.cxx Calcium_Ports.idl
+
