PR: synchro V6_main tag mergeto_V7_main_11Feb13

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

diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am
index 52fbad34bdd85fc4294f58de8fd1ad41cff9d3fc..b59d9891498f7812309203afd05ff0b6c8024a4d 100644 (file)
--- a/src/OBJECT/Makefile.am
+++ b/src/OBJECT/Makefile.am
@@ -1,20 +1,20 @@
-#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  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
-#  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 OBJECT : interactive object for Geometry entities visualization
@@ -28,27 +28,28 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 # header files 
 salomeinclude_HEADERS =                                \
        GEOM_Actor.h                            \
-       GEOM_AssemblyBuilder.h                  \
        GEOM_AISShape.hxx                       \
        GEOM_AISShape.ixx                       \
        GEOM_AISShape.jxx                       \
        Handle_GEOM_AISShape.hxx                \
+       GEOM_TopWireframeShape.hxx              \
+       GEOM_TopWireframeShape.ixx              \
+       GEOM_TopWireframeShape.jxx              \
+       Handle_GEOM_TopWireframeShape.hxx       \
        GEOM_InteractiveObject.hxx              \
        GEOM_InteractiveObject.ixx              \
        GEOM_InteractiveObject.jxx              \
        Handle_GEOM_InteractiveObject.hxx       \
        GEOM_AISTrihedron.hxx                   \
        GEOM_VTKTrihedron.hxx                   \
+       GEOM_VTKPropertyMaterial.hxx            \
        GEOM_AISVector.hxx                      \
        GEOM_OBJECT_defs.hxx                    \
        GEOM_OCCReader.h                        \
        GEOM_SmartPtr.h                         \
+       GEOM_PainterPolyDataMapper.h            \
        GEOM_DeviceActor.h                      \
-       GEOM_EdgeSource.h                       \
-       GEOM_FaceSource.h                       \
-       GEOM_ShadingFace.h                      \
-       GEOM_VertexSource.h                     \
-       GEOM_WireframeFace.h
+       GEOM_Constants.h
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOMObject.la
@@ -56,18 +57,16 @@ lib_LTLIBRARIES = libGEOMObject.la
 dist_libGEOMObject_la_SOURCES =                \
        GEOM_Actor.cxx                  \
        GEOM_OCCReader.cxx              \
-       GEOM_AssemblyBuilder.cxx        \
        GEOM_AISShape.cxx               \
+       GEOM_TopWireframeShape.cxx      \
        GEOM_InteractiveObject.cxx      \
        GEOM_AISTrihedron.cxx           \
        GEOM_VTKTrihedron.cxx           \
+       GEOM_VTKPropertyMaterial.cxx    \
        GEOM_AISVector.cxx              \
-       GEOM_DeviceActor.cxx            \
-       GEOM_EdgeSource.cxx             \
-       GEOM_FaceSource.cxx             \
-       GEOM_ShadingFace.cxx            \
-       GEOM_VertexSource.cxx           \
-       GEOM_WireframeFace.cxx
+       GEOM_PainterPolyDataMapper.cxx  \
+       GEOM_DeviceActor.cxx            \
+       GEOM_Constants.cxx
 
 
 libGEOMObject_la_CPPFLAGS =    \
@@ -78,15 +77,17 @@ 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) \
        $(KERNEL_LDFLAGS)  -lSALOMELocalTrace \
-       $(GUI_LDFLAGS) -lsuit -lqtx -lVTKViewer -lSVTK -lSalomeObject
-#      $(CORBA_LIBS) \
+       $(GUI_LDFLAGS) -lsuit -lqtx -lVTKViewer -lSVTK -lSalomeObject -lSalomeApp\
+       $(CORBA_LIBS)
 #      $(STDLIB) \
 #      $(PYTHON_LIBS) \
 #      $(OGL_LIBS)