X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FContainer%2FMakefile.am;h=c3a870cbe4daed1d0ebf494080ad55470005b887;hb=0b2ca5a4bb9e7faa3e2c14e4fd47c9b739d21de5;hp=f160095b7e2ef8a37d80a0a4a10fc9cbd0599cd3;hpb=1a9c06c1b6b7bb7a2a9787229e1c113f4c81cb0c;p=modules%2Fkernel.git diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am index f160095b7..c3a870cbe 100644 --- a/src/Container/Makefile.am +++ b/src/Container/Makefile.am @@ -1,32 +1,30 @@ -# SALOME Container : implementation of container and engine for Kernel +# Copyright (C) 2007-2008 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 # -# Copyright (C) 2003 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# 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 +# +# SALOME Container : implementation of container and engine for Kernel # File : Makefile.am # Author : Guillaume Boulant (CSSI) # Module : KERNEL # $Header$ - - +# include $(top_srcdir)/salome_adm/unix/make_common_starter.am # @@ -41,11 +39,14 @@ salomeinclude_HEADERS = \ SALOME_FileTransfer_i.hxx \ SALOME_FileRef_i.hxx \ SALOME_ContainerManager.hxx \ - Container_init_python.hxx + Container_init_python.hxx \ + SALOME_Container.hxx \ + Salome_file_i.hxx # Scripts to be installed -dist_salomescript_DATA =\ +dist_salomescript_PYTHON =\ SALOME_ComponentPy.py \ + SALOME_PyNode.py \ SALOME_Container.py # These files are executable scripts @@ -61,9 +62,7 @@ dist_salomescript_SCRIPTS=\ # This local variable defines the list of CPPFLAGS common to all target in this package. COMMON_CPPFLAGS=\ @PYTHON_INCLUDES@ \ - @MPI_INCLUDES@ \ - @CAS_CPPFLAGS@ @CAS_CXXFLAGS@ \ - @QT_MT_INCLUDES@ \ + @HDF5_INCLUDES@ \ -I$(srcdir)/../Basics \ -I$(srcdir)/../SALOMELocalTrace \ -I$(srcdir)/../NamingService \ @@ -71,23 +70,29 @@ COMMON_CPPFLAGS=\ -I$(srcdir)/../Registry \ -I$(srcdir)/../Notification \ -I$(srcdir)/../ResourcesManager \ - -I$(top_builddir)/salome_adm/unix \ + -I$(srcdir)/../HDFPersist \ -I$(top_builddir)/idl \ - @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @LIBXML_INCLUDES@ # This local variable defines the list of dependant libraries common to all target in this package. COMMON_LIBS =\ ../Registry/libRegistry.la \ ../Notification/libSalomeNotification.la \ ../ResourcesManager/libSalomeResourcesManager.la \ + ../ResourcesManager/libResourcesManager.la \ ../NamingService/libSalomeNS.la \ ../Utils/libOpUtil.la \ ../SALOMELocalTrace/libSALOMELocalTrace.la \ ../Basics/libSALOMEBasics.la \ - $(top_builddir)/idl/libSalomeIDLKernel.la\ - @PYTHON_LIBS@ \ - @MPI_LIBS@ \ - @CORBA_LIBS@ + ../HDFPersist/libSalomeHDFPersist.la \ + $(top_builddir)/idl/libSalomeIDLKernel.la \ + @CORBA_LIBS@ \ + $(PYTHON_LIBS) + +if WITH_MPI_SEQ_CONTAINER +COMMON_CPPFLAGS += @MPI_INCLUDES@ +COMMON_LIBS += @MPI_LIBS@ +endif # # =============================================================== @@ -100,8 +105,9 @@ libSalomeContainer_la_SOURCES=\ Container_i.cxx \ SALOME_FileTransfer_i.cxx \ SALOME_FileRef_i.cxx \ + Container_init_python.cxx \ SALOME_ContainerManager.cxx \ - Container_init_python.cxx + Salome_file_i.cxx libSalomeContainer_la_CPPFLAGS =\ $(COMMON_CPPFLAGS) @@ -113,13 +119,19 @@ libSalomeContainer_la_LDFLAGS =\ libSalomeContainer_la_LIBADD =\ $(COMMON_LIBS) +if WITH_PACO_PARALLEL +libSalomeContainer_la_CPPFLAGS += -DWITH_PACO_PARALLEL @PACO_INCLUDES@ +libSalomeContainer_la_LIBADD += @PACO_LIBS@ +endif # # =============================================================== # Executables targets # =============================================================== # -bin_PROGRAMS = SALOME_Container SALOME_ContainerManagerServer +bin_PROGRAMS = SALOME_Container +noinst_PROGRAMS = TestSalome_file + SALOME_Container_SOURCES =\ SALOME_Container.cxx \ SALOME_Container_SignalsHandler.cxx @@ -127,20 +139,34 @@ SALOME_Container_SOURCES =\ SALOME_Container_CPPFLAGS =\ $(COMMON_CPPFLAGS) - -SALOME_Container_LDADD =\ +SALOME_Container_LDADD = \ libSalomeContainer.la \ - $(COMMON_LIBS) \ - ../Basics/libSALOMEBasics.la + ../Basics/libSALOMEBasics.la \ + $(HDF5_LIBS) \ + $(CORBA_LIBS) \ + $(PYTHON_LIBS) + +if WITH_MPI_SEQ_CONTAINER +SALOME_Container_LDADD += $(MPI_LIBS) +endif +SALOME_Container_LDFLAGS =\ +-Xlinker -export-dynamic -SALOME_ContainerManagerServer_SOURCES =\ - SALOME_ContainerManagerServer.cxx +TestSalome_file_SOURCES =\ + TestSalome_file.cxx -SALOME_ContainerManagerServer_CPPFLAGS=\ +TestSalome_file_CPPFLAGS =\ $(COMMON_CPPFLAGS) -SALOME_ContainerManagerServer_LDADD =\ +TestSalome_file_LDADD =\ libSalomeContainer.la \ - $(COMMON_LIBS) \ - ../Basics/libSALOMEBasics.la + ../Basics/libSALOMEBasics.la \ + $(HDF5_LIBS) \ + $(CORBA_LIBS) \ + $(PYTHON_LIBS) + +install-data-hook: + @for f in $(dist_salomescript_PYTHON) ; do \ + chmod -f a+x $(DESTDIR)$(salomescriptdir)/$$f ; \ + done