Merge from V6_main_20120808 08Aug12

[modules/kernel.git] / src / DSC / DSC_Basic / Makefile.am

diff --git a/src/DSC/DSC_Basic/Makefile.am b/src/DSC/DSC_Basic/Makefile.am
index e29f456d537b5ffece33fcd8bb90cc7fb1c1a5f6..439889025661d71ff948c8d407a667617ea4e428 100644 (file)
--- a/src/DSC/DSC_Basic/Makefile.am
+++ b/src/DSC/DSC_Basic/Makefile.am
@@ -1,24 +1,25 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  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
 #
+
 #  File   : Makefile.am
 #  Author : André RIBES (EDF)
 #  Module : KERNEL
@@ -45,12 +46,12 @@ salomeinclude_HEADERS = ConnectionManager_i.hxx \
 
 # This local variable defines the list of CPPFLAGS common to all target in this package.
 COMMON_CPPFLAGS= -I$(top_srcdir)/src/Container \
+                -I$(top_srcdir)/src/GenericObj \
                 -I$(top_srcdir)/src/Notification \
                 -I$(top_srcdir)/src/SALOMELocalTrace \
                 -I$(top_srcdir)/src/Basics \
                 -I$(top_srcdir)/src/NamingService \
                 -I$(top_srcdir)/src/Utils \
-                -I$(top_builddir)/salome_adm/unix \
                 -I$(top_builddir)/idl \
                 @CORBA_CXXFLAGS@ @CORBA_INCLUDES@
 
@@ -89,4 +90,5 @@ SALOME_ConnectionManagerServer_CXXFLAGS = $(COMMON_CPPFLAGS)
 
 SALOME_ConnectionManagerServer_LDADD    = $(top_builddir)/idl/libSalomeIDLKernel.la \
                                          $(top_builddir)/src/NamingService/libSalomeNS.la \
-                                         $(top_builddir)/src/SALOMELocalTrace/libSALOMELocalTrace.la
+                                         $(top_builddir)/src/SALOMELocalTrace/libSALOMELocalTrace.la \
+                                         ${COMMON_LIBS}