Merge from BR_KERNEL_REFACTORING

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

diff --git a/src/TestContainer/Makefile.am b/src/TestContainer/Makefile.am
index 144cbe3898526cb5ff5f342f8b177986b79cabe9..63b2a17cf5f6d874907971aaa8022549c3d1a182 100644 (file)
--- a/src/TestContainer/Makefile.am
+++ b/src/TestContainer/Makefile.am
@@ -1,24 +1,25 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2013  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 TestContainer : test of container creation and its life cycle
 #  File   : Makefile.in
 #  Author : Paul RASCLE, EDF - MARC TAJCHMAN, CEA
@@ -32,11 +33,10 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am
 # Files to be installed
 # ===============================================================
 #
-# header files  
+# header files
 # Scripts to be installed
-dist_salomescript_DATA = \
+dist_salomescript_PYTHON = \
        SALOME_TestComponentPy.py \
-       TestComponentPy.py \
        TestLogger.py
 
 #
@@ -54,8 +54,8 @@ COMMON_CPPFLAGS=\
        -I$(srcdir)/../Registry \
        -I$(srcdir)/../Notification \
        -I$(srcdir)/../ResourcesManager \
+       -I$(srcdir)/../GenericObj \
        -I$(srcdir)/../Container \
-       -I$(top_builddir)/salome_adm/unix \
        -I$(top_builddir)/idl \
        @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
 
@@ -70,6 +70,7 @@ COMMON_LIBS =\
        ../Utils/libOpUtil.la \
        ../SALOMELocalTrace/libSALOMELocalTrace.la \
        ../Basics/libSALOMEBasics.la \
+       ../GenericObj/libSalomeGenericObj.la \
        $(top_builddir)/idl/libSalomeIDLKernel.la
 
 #
@@ -97,11 +98,13 @@ bin_PROGRAMS = TestContainer TestLogger
 TestContainer_SOURCES  = TestContainer.cxx
 TestContainer_CPPFLAGS = $(COMMON_CPPFLAGS)
 TestContainer_LDADD    = libSalomeTestComponentEngine.la \
+                        $(COMMON_LIBS) \
                         ../Basics/libSALOMEBasics.la \
                          $(CORBA_LIBS)
 
 TestLogger_SOURCES     = TestLogger.cxx
 TestLogger_CPPFLAGS    = $(COMMON_CPPFLAGS)
 TestLogger_LDADD       = libSalomeTestComponentEngine.la \
+                        $(COMMON_LIBS) \
                         ../Basics/libSALOMEBasics.la \
                          $(CORBA_LIBS)