merge from branch BR_V5_DEV

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

diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am
index a7cbd05daf5ce67ced9acf5e6b3fa07ab3dce7c4..5f8172cff83bad609ce0e7e3ee4a0158f7669f2e 100644 (file)
--- 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
+#
+#  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.
 #
-#  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#  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
 
 #
@@ -83,13 +81,14 @@ 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 \
        ../HDFPersist/libSalomeHDFPersist.la \
        ../Batch/libSalomeBatch.la \
-       $(top_builddir)/idl/libSalomeIDLKernel.la\
+       $(top_builddir)/idl/libSalomeIDLKernel.la \
        @MPI_LIBS@ \
        @CORBA_LIBS@ \
        $(PYTHON_LIBS)
@@ -141,6 +140,7 @@ SALOME_Container_CPPFLAGS =\
 
 SALOME_Container_LDADD = \
        libSalomeContainer.la \
+       ../Basics/libSALOMEBasics.la \
        $(HDF5_LIBS) \
        $(MPI_LIBS) \
        $(CORBA_LIBS) \
@@ -157,6 +157,7 @@ TestSalome_file_CPPFLAGS =\
 
 TestSalome_file_LDADD =\
        libSalomeContainer.la \
+       ../Basics/libSALOMEBasics.la \
        $(HDF5_LIBS) \
        $(MPI_LIBS) \
        $(CORBA_LIBS) \