Merge from BR_V5_DEV 16Feb09

[modules/visu.git] / src / PIPELINE / Makefile.am

diff --git a/src/PIPELINE/Makefile.am b/src/PIPELINE/Makefile.am
index 51adaa9a0713cb4a6107386c6a37cadbcfa128ed..f8ebc82ea012692cd38040f839ab60daf2b70150 100644 (file)
--- a/src/PIPELINE/Makefile.am
+++ b/src/PIPELINE/Makefile.am
@@ -1,6 +1,6 @@
-#  VISU OBJECT : interactive object for VISU entities implementation
+#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  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
@@ -17,13 +17,12 @@
 #  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
 #
+#  VISU OBJECT : interactive object for VISU entities implementation
 #  File   : Makefile.in
 #  Module : VISU
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 lib_LTLIBRARIES= libVisuPipeLine.la
@@ -36,6 +35,7 @@ salomeinclude_HEADERS= \
        VISU_PipeLineUtils.hxx \
        VISU_PipeLine.hxx \
        VISU_ColoredPL.hxx \
+       VISU_MergedPL.hxx \
        VISU_UnstructuredGridPL.hxx \
        VISU_MeshPL.hxx \
        VISU_ScalarMapPL.hxx \
@@ -50,8 +50,10 @@ salomeinclude_HEADERS= \
        VISU_Extractor.hxx \
        VISU_FieldTransform.hxx \
        VISU_MaskPointsFilter.hxx \
+       VISU_PolyDataPL.hxx \
        VISU_GaussPointsPL.hxx \
        VISU_Plot3DPL.hxx \
+       VISU_DeformedGridPL.hxx \
        VISU_OpenGLPointSpriteMapper.hxx \
        VISU_ImplicitFunctionWidget.hxx \
        SALOME_ExtractGeometry.h \
@@ -60,8 +62,14 @@ salomeinclude_HEADERS= \
        VISU_PlanesWidget.hxx \
        VISU_SphereWidget.hxx \
        VISU_WidgetCtrl.hxx \
-       VISU_ScalarMapOnDeformedShapePL.hxx \
-       VISUPipeline.hxx
+       VISU_DeformedShapeAndScalarMapPL.hxx \
+       VISUPipeline.hxx \
+       VISU_LabelPointsFilter.hxx \
+       VISU_ElnoDisassembleFilter.hxx \
+       VISU_ElnoAssembleFilter.hxx \
+       VISU_DeformationPL.hxx \
+       VISU_OptionalDeformationPL.hxx \
+       VISU_XYPlotActor.hxx
 
 dist_libVisuPipeLine_la_SOURCES= \
        VISU_MapperHolder.cxx \
@@ -71,6 +79,7 @@ dist_libVisuPipeLine_la_SOURCES= \
        VISU_PipeLineUtils.cxx \
        VISU_PipeLine.cxx \
        VISU_ColoredPL.cxx \
+       VISU_MergedPL.cxx \
        VISU_UnstructuredGridPL.cxx \
        VISU_MeshPL.cxx \
        VISU_ScalarMapPL.cxx \
@@ -85,8 +94,10 @@ dist_libVisuPipeLine_la_SOURCES= \
        VISU_Extractor.cxx \
        VISU_FieldTransform.cxx \
        VISU_MaskPointsFilter.cxx \
+       VISU_PolyDataPL.cxx \
        VISU_GaussPointsPL.cxx \
        VISU_Plot3DPL.cxx \
+       VISU_DeformedGridPL.cxx \
        SALOME_ExtractGeometry.cxx \
        SALOME_ExtractPolyDataGeometry.cxx \
        VISU_OpenGLPointSpriteMapper.cxx \
@@ -95,10 +106,17 @@ dist_libVisuPipeLine_la_SOURCES= \
        VISU_SphereWidget.cxx \
        VISU_WidgetCtrl.cxx \
        VISU_ScalarBarCtrl.cxx \
-       VISU_ScalarMapOnDeformedShapePL.cxx
+       VISU_DeformedShapeAndScalarMapPL.cxx \
+       VISU_LabelPointsFilter.cxx \
+       VISU_ElnoDisassembleFilter.cxx \
+       VISU_ElnoAssembleFilter.cxx \
+       VISU_DeformationPL.cxx \
+       VISU_OptionalDeformationPL.cxx\
+       VISU_XYPlotActor.cxx
 
 libVisuPipeLine_la_CPPFLAGS= \
        $(VTK_INCLUDES) \
+       $(QT_INCLUDES) \
        $(KERNEL_CXXFLAGS) \
        $(GUI_CXXFLAGS) \
        $(MED_CXXFLAGS) \
@@ -106,12 +124,13 @@ libVisuPipeLine_la_CPPFLAGS= \
        -I$(srcdir)/../CONVERTOR
 
 libVisuPipeLine_la_LDFLAGS= \
-       $(MED2_LIBS) \
-       $(VTK_LIBS) -lVTKViewer \
        $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
        $(GUI_LDFLAGS) \
        $(MED_LDFLAGS) \
-       ../CONVERTOR/libVisuConvertor.la
+       ../CONVERTOR/libVisuConvertor.la \
+       $(VTK_LIBS) -lVTKViewer \
+       $(MED2_LIBS) \
+       $(QT_LIBS)
 
 
 # Executables targets