Merge from V6_main_20120808 08Aug12

[modules/geom.git] / src / GEOM_I / Makefile.am

diff --git a/src/GEOM_I/Makefile.am b/src/GEOM_I/Makefile.am
index 4458042064a96507179041ad225df4ffa7bcb5dc..dfdba30a50f716037d4ce5b9a2c8fd77680d2707 100644 (file)
--- a/src/GEOM_I/Makefile.am
+++ b/src/GEOM_I/Makefile.am
@@ -1,31 +1,29 @@
-#  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
+# 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
 #
+
 #  GEOM GEOM : implementaion of GEOM_Gen.idl
 #  File   : Makefile.in
 #  Author : Patrick GOLDBRONN (CEA)
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-#
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
@@ -47,6 +45,7 @@ salomeinclude_HEADERS =                       \
        GEOM_ITransformOperations_i.hh  \
        GEOM_IMeasureOperations_i.hh    \
        GEOM_IGroupOperations_i.hh      \
+       GEOM_IAdvancedOperations_i.hh   \
        GEOM_Gen_i.hh                   \
        GEOM_GEOM_I.hxx
 
@@ -65,6 +64,7 @@ dist_libGEOMEngine_la_SOURCES =               \
        GEOM_ITransformOperations_i.cc  \
        GEOM_IMeasureOperations_i.cc    \
        GEOM_IGroupOperations_i.cc      \
+       GEOM_IAdvancedOperations_i.cc   \
        GEOM_Gen_i.cc                   \
        GEOM_DumpPython.cc
 
@@ -81,8 +81,7 @@ libGEOMEngine_la_CPPFLAGS =           \
        -I$(srcdir)/../GEOMImpl         \
        -I$(srcdir)/../GEOMAlgo         \
        -I$(srcdir)/../GEOM             \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl
 
 
 libGEOMEngine_la_LDFLAGS  =                    \
@@ -91,7 +90,7 @@ libGEOMEngine_la_LDFLAGS  =                   \
        ../GEOMImpl/libGEOMimpl.la              \
        ../SKETCHER/libGEOMSketcher.la          \
        ../GEOM/libGEOMbasic.la                 \
-       $(KERNEL_LDFLAGS) -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS     \
+       $(KERNEL_LDFLAGS) -lOpUtil -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS    \
        $(CAS_DATAEXCHANGE)                     \
        $(CAS_LDPATH) -lTKFillet -lTKOffset