a little bug

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

diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am
index 9c6bffe17beb3542e9ecb2e70f8c07455927c4bc..c5113f43bc4d0b8d3773d4c08a6e5ef5ce58cfb2 100644 (file)
--- a/src/Container/Makefile.am
+++ b/src/Container/Makefile.am
@@ -1,24 +1,25 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2011  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-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 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.
+# 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
+# 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
+# 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)
@@ -46,6 +47,7 @@ salomeinclude_HEADERS = \
 # Scripts to be installed
 dist_salomescript_PYTHON =\
        SALOME_ComponentPy.py \
+       SALOME_PyNode.py \
        SALOME_Container.py
 
 # These files are executable scripts
@@ -62,7 +64,6 @@ dist_salomescript_SCRIPTS=\
 COMMON_CPPFLAGS=\
        @PYTHON_INCLUDES@ \
        @HDF5_INCLUDES@ \
-       -I$(srcdir)/../Batch \
        -I$(srcdir)/../Basics \
        -I$(srcdir)/../SALOMELocalTrace \
        -I$(srcdir)/../NamingService \
@@ -71,7 +72,7 @@ COMMON_CPPFLAGS=\
        -I$(srcdir)/../Notification \
        -I$(srcdir)/../ResourcesManager \
        -I$(srcdir)/../HDFPersist \
-       -I$(top_builddir)/salome_adm/unix \
+       -I$(srcdir)/../GenericObj \
        -I$(top_builddir)/idl \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @LIBXML_INCLUDES@
 
@@ -86,7 +87,7 @@ COMMON_LIBS =\
        ../SALOMELocalTrace/libSALOMELocalTrace.la \
        ../Basics/libSALOMEBasics.la \
        ../HDFPersist/libSalomeHDFPersist.la \
-       ../Batch/libSalomeBatch.la \
+       ../GenericObj/libSalomeGenericObj.la \
        $(top_builddir)/idl/libSalomeIDLKernel.la \
        @CORBA_LIBS@ \
        $(PYTHON_LIBS)
@@ -143,7 +144,7 @@ SALOME_Container_CPPFLAGS =\
 
 SALOME_Container_LDADD = \
        libSalomeContainer.la \
-       ../Basics/libSALOMEBasics.la \
+       ../Basics/libSALOMEBasics.la ${COMMON_LIBS} \
        $(HDF5_LIBS) \
        $(CORBA_LIBS) \
        $(PYTHON_LIBS)
@@ -164,6 +165,7 @@ TestSalome_file_CPPFLAGS =\
 TestSalome_file_LDADD =\
        libSalomeContainer.la \
        ../Basics/libSALOMEBasics.la \
+       $(COMMON_LIBS) \
        $(HDF5_LIBS) \
        $(CORBA_LIBS) \
        $(PYTHON_LIBS)