Merge from V5_1_main 14/05/2010

[modules/kernel.git] / src / ParallelContainer / Makefile.am

diff --git a/src/ParallelContainer/Makefile.am b/src/ParallelContainer/Makefile.am
index 62d705aacba7d5bde86a87863891299dfa05a4b5..6635ab230ff77c7e400fc85c8970565efe48a734 100644 (file)
--- a/src/ParallelContainer/Makefile.am
+++ b/src/ParallelContainer/Makefile.am
@@ -1,4 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  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
@@ -19,6 +19,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  File   : Makefile.am
 #  Author : André RIBES (EDF)
 #  Module : KERNEL
@@ -34,6 +35,7 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 salomeinclude_HEADERS = SALOME_ParallelComponent_i.hxx \
                        SALOME_ParallelContainer_i.hxx \
                        SALOME_ParallelContainerProxy_i.hxx \
+                       SALOME_ParallelGlobalProcessVar_i.hxx \
                        Parallel_Salome_file_i.hxx
 
 #
@@ -51,11 +53,12 @@ COMMON_CPPFLAGS= -I$(top_srcdir)/src/Container \
                 -I$(top_srcdir)/src/Registry \
                 -I$(top_srcdir)/src/Utils \
                 -I$(srcdir)/../HDFPersist \
-                -I$(top_builddir)/salome_adm/unix \
                 -I$(top_builddir)/idl \
                 -I$(top_srcdir)/src/SALOMETraceCollector \
+                @PYTHON_INCLUDES@ \
                 @CORBA_CXXFLAGS@ \
                 @CORBA_INCLUDES@ \
+                @MPI_INCLUDES@ \
                 @PACO_INCLUDES@
 
 # This local variable defines the list of dependant libraries common to all target in this package.
@@ -64,7 +67,8 @@ COMMON_LIBS = $(top_builddir)/src/Container/libSalomeContainer.la \
              $(top_builddir)/idl/libSalomeParallelIDLKernel.la \
              $(top_builddir)/idl/libSalomeIDLKernel.la \
              @CORBA_LIBS@ \
-             @PACO_LIBS@
+             @PACO_LIBS@ \
+             $(PYTHON_LIBS)
 
 #
 # ===============================================================
@@ -76,12 +80,12 @@ lib_LTLIBRARIES = libSalomeParallelContainer.la
 libSalomeParallelContainer_la_SOURCES  = SALOME_ParallelComponent_i.cxx \
                                         SALOME_ParallelContainer_i.cxx \
                                         SALOME_ParallelContainerProxy_i.cxx \
-                                        $(top_srcdir)/src/Container/Salome_file_i.cxx \
-                                        Parallel_Salome_file_i.cxx
+                                        Parallel_Salome_file_i.cxx \
+                                        SALOME_ParallelGlobalProcessVar_i.cxx
 
 libSalomeParallelContainer_la_CXXFLAGS = $(COMMON_CPPFLAGS)
 
-libSalomeParallelContainer_la_LIBADD   = $(COMMON_LIBS)
+libSalomeParallelContainer_la_LIBADD   = $(COMMON_LIBS) @MPI_LIBS@
 
 libSalomeParallelContainer_la_LDFLAGS = -no-undefined -version-info=0:0:0