Merge from V6_main_20120808 08Aug12

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

diff --git a/src/GEOMBase/Makefile.am b/src/GEOMBase/Makefile.am
index 5c7b9bdb970b468f4adcb4f7453f48c0d6b3bd51..c66a805199cbdc563f8cb036f5bad72f9561021b 100644 (file)
--- a/src/GEOMBase/Makefile.am
+++ b/src/GEOMBase/Makefile.am
@@ -1,24 +1,22 @@
-#  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 GEOMBASE : 
 # File    : Makefile.am
 # Author  : Alexander BORODIN, Open CASCADE S.A.S. (alexander.borodin@opencascade.com)
@@ -35,13 +33,15 @@ salomeinclude_HEADERS =             \
        GEOMBase_Skeleton.h     \
        GEOMBase_Helper.h       \
        GEOM_Operation.h        \
-       GEOM_GEOMBase.hxx
+       GEOM_GEOMBase.hxx       \
+       GEOM_GenericObjPtr.h
 
 dist_libGEOMBase_la_SOURCES =          \
        GEOMBase.cxx                    \
        GEOMBase_Skeleton.cxx           \
        GEOMBase_Helper.cxx             \
-       GEOM_Operation.cxx
+       GEOM_Operation.cxx              \
+       GEOM_GenericObjPtr.cxx
 
 MOC_FILES =                            \
        GEOMBase_Skeleton_moc.cxx
@@ -61,14 +61,14 @@ libGEOMBase_la_CPPFLAGS =           \
        $(GUI_CXXFLAGS)                 \
        $(CORBA_CXXFLAGS)               \
        $(CORBA_INCLUDES)               \
+       $(OPENCV_INCLUDES)              \
        -I$(srcdir)/../OBJECT           \
        -I$(srcdir)/../GEOMClient       \
        -I$(srcdir)/../GEOMImpl         \
        -I$(srcdir)/../GEOMGUI          \
        -I$(srcdir)/../DlgRef           \
        -I$(top_builddir)/src/DlgRef    \
-       -I$(top_builddir)/idl           \
-       -I$(top_builddir)/salome_adm/unix
+       -I$(top_builddir)/idl           
 
 libGEOMBase_la_LDFLAGS  =              \
        ../../idl/libSalomeIDLGEOM.la   \
@@ -76,4 +76,5 @@ libGEOMBase_la_LDFLAGS  =             \
        ../DlgRef/libDlgRef.la          \
        $(KERNEL_LDFLAGS) -lOpUtil      \
        $(GUI_LDFLAGS) -lsuit -lOCCViewer -lVTKViewer -lSVTK -lSalomePrs -lSalomeApp -lCAM \
-       $(CAS_LDPATH) -lTKPrim
+       $(CAS_LDPATH) -lTKPrim          \
+       $(OPENCV_LIBS)