Mantis issue 0020853: EDF 1394 GEOM: Partition fails between 2 faces. A patch by...

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

diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am
index 6270eec624645fdccc037b66e1c4f22fb67d68ae..454f6c0f8202038ab26611abf886287ec24d4da3 100644 (file)
--- a/src/OBJECT/Makefile.am
+++ b/src/OBJECT/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  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) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  GEOM OBJECT : interactive object for Geometry entities visualization
 #  File   : Makefile.in
 #  Author : Damien COQUERET (OCC)
@@ -45,12 +43,7 @@ salomeinclude_HEADERS =                              \
        GEOM_OBJECT_defs.hxx                    \
        GEOM_OCCReader.h                        \
        GEOM_SmartPtr.h                         \
-       GEOM_DeviceActor.h                      \
-       GEOM_EdgeSource.h                       \
-       GEOM_FaceSource.h                       \
-       GEOM_ShadingFace.h                      \
-       GEOM_VertexSource.h                     \
-       GEOM_WireframeFace.h
+       GEOM_DeviceActor.h
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOMObject.la
@@ -64,12 +57,7 @@ dist_libGEOMObject_la_SOURCES =              \
        GEOM_AISTrihedron.cxx           \
        GEOM_VTKTrihedron.cxx           \
        GEOM_AISVector.cxx              \
-       GEOM_DeviceActor.cxx            \
-       GEOM_EdgeSource.cxx             \
-       GEOM_FaceSource.cxx             \
-       GEOM_ShadingFace.cxx            \
-       GEOM_VertexSource.cxx           \
-       GEOM_WireframeFace.cxx
+       GEOM_DeviceActor.cxx
 
 
 libGEOMObject_la_CPPFLAGS =    \
@@ -80,9 +68,11 @@ libGEOMObject_la_CPPFLAGS =  \
        $(CAS_CPPFLAGS)         \
        $(VTK_INCLUDES)         \
        $(KERNEL_CXXFLAGS)      \
-       $(GUI_CXXFLAGS) 
-       
+       $(GUI_CXXFLAGS)         \
+       -I$(srcdir)/../OCC2VTK
+
 libGEOMObject_la_LDFLAGS  =                    \
+       ../OCC2VTK/libOCC2VTK.la                \
        $(QT_MT_LIBS) \
        $(CAS_KERNEL) -lTKBRep -lTKG2d -lTKG3d -lTKV3d -lTKMesh -lTKGeomBase -lTKGeomAlgo -lTKTopAlgo -lTKService \
        $(VTK_LIBS) \