Salome HOME
Merge from V6_main_20120808 08Aug12
[modules/smesh.git] / src / StdMeshers_I / Makefile.am
index 526d71fc580129b29587b6694d470da136bf37fb..4bc901d2dfa6750e7358f1c3c6a5d9e8f6ab0f44 100644 (file)
@@ -1,30 +1,28 @@
-#  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
 #
+
 #  SMESH StdMeshers_I : idl implementation based on 'StdMeshersPlugin' unit's classes
 #  File   : Makefile.in
 #  Author : Julia DOROVSKIKH
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : SMESH
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
@@ -32,6 +30,7 @@ salomeinclude_HEADERS = \
        StdMeshers_LocalLength_i.hxx \
        StdMeshers_StartEndLength_i.hxx \
        StdMeshers_Arithmetic1D_i.hxx \
+       StdMeshers_FixedPoints1D_i.hxx \
        StdMeshers_NumberOfSegments_i.hxx \
        StdMeshers_Deflection1D_i.hxx \
        StdMeshers_Propagation_i.hxx \
@@ -47,6 +46,7 @@ salomeinclude_HEADERS = \
        StdMeshers_QuadranglePreference_i.hxx \
        StdMeshers_QuadraticMesh_i.hxx \
        StdMeshers_NumberOfLayers_i.hxx \
+       StdMeshers_NumberOfLayers2D_i.hxx \
        StdMeshers_Prism_3D_i.hxx \
        StdMeshers_ProjectionSource1D_i.hxx \
        StdMeshers_ProjectionSource2D_i.hxx \
@@ -54,13 +54,22 @@ salomeinclude_HEADERS = \
        StdMeshers_Projection_1D_2D_3D_i.hxx \
        StdMeshers_ObjRefUlils.hxx \
        StdMeshers_LayerDistribution_i.hxx \
+       StdMeshers_LayerDistribution2D_i.hxx \
        StdMeshers_CompositeSegment_1D_i.hxx \
        StdMeshers_SegmentAroundVertex_0D_i.hxx \
        StdMeshers_SegmentLengthAroundVertex_i.hxx \
        StdMeshers_UseExisting_1D2D_i.hxx \
-       StdMeshers_TrianglePreference_i.hxx \
        StdMeshers_MaxLength_i.hxx \
-       SMESH_StdMeshers_I.hxx
+       StdMeshers_QuadrangleParams_i.hxx \
+       StdMeshers_RadialQuadrangle_1D2D_i.hxx \
+       SMESH_StdMeshers_I.hxx \
+       StdMeshers_ImportSource1D_i.hxx \
+       StdMeshers_ImportSource2D_i.hxx \
+       StdMeshers_Import_1D_i.hxx \
+       StdMeshers_Import_1D2D_i.hxx \
+       StdMeshers_ViscousLayers_i.hxx \
+       StdMeshers_CartesianParameters3D_i.hxx \
+       StdMeshers_Cartesian_3D_i.hxx
 
 # Libraries targets
 lib_LTLIBRARIES = libStdMeshersEngine.la
@@ -70,6 +79,7 @@ dist_libStdMeshersEngine_la_SOURCES = \
         StdMeshers_LocalLength_i.cxx \
        StdMeshers_StartEndLength_i.cxx \
        StdMeshers_Arithmetic1D_i.cxx \
+       StdMeshers_FixedPoints1D_i.cxx \
        StdMeshers_NumberOfSegments_i.cxx \
        StdMeshers_Deflection1D_i.cxx \
         StdMeshers_Propagation_i.cxx \
@@ -85,6 +95,7 @@ dist_libStdMeshersEngine_la_SOURCES = \
        StdMeshers_QuadranglePreference_i.cxx \
        StdMeshers_QuadraticMesh_i.cxx \
        StdMeshers_NumberOfLayers_i.cxx \
+       StdMeshers_NumberOfLayers2D_i.cxx \
        StdMeshers_Prism_3D_i.cxx \
        StdMeshers_ProjectionSource1D_i.cxx \
        StdMeshers_ProjectionSource2D_i.cxx \
@@ -92,12 +103,21 @@ dist_libStdMeshersEngine_la_SOURCES = \
        StdMeshers_Projection_1D_2D_3D_i.cxx \
        StdMeshers_ObjRefUlils.cxx \
        StdMeshers_LayerDistribution_i.cxx \
+       StdMeshers_LayerDistribution2D_i.cxx \
        StdMeshers_CompositeSegment_1D_i.cxx \
        StdMeshers_SegmentAroundVertex_0D_i.cxx \
        StdMeshers_SegmentLengthAroundVertex_i.cxx \
        StdMeshers_UseExisting_1D2D_i.cxx \
-       StdMeshers_TrianglePreference_i.cxx \
-       StdMeshers_MaxLength_i.cxx
+       StdMeshers_MaxLength_i.cxx \
+       StdMeshers_QuadrangleParams_i.cxx \
+       StdMeshers_RadialQuadrangle_1D2D_i.cxx \
+       StdMeshers_ImportSource1D_i.cxx \
+       StdMeshers_ImportSource2D_i.cxx \
+       StdMeshers_Import_1D_i.cxx \
+       StdMeshers_Import_1D2D_i.cxx \
+       StdMeshers_ViscousLayers_i.cxx \
+       StdMeshers_CartesianParameters3D_i.cxx \
+       StdMeshers_Cartesian_3D_i.cxx
 
 # additionnal information to compil and link file
 libStdMeshersEngine_la_CPPFLAGS = \
@@ -107,19 +127,19 @@ libStdMeshersEngine_la_CPPFLAGS = \
        $(GEOM_CXXFLAGS) \
        $(MED_CXXFLAGS) \
        $(BOOST_CPPFLAGS) \
+        $(VTK_INCLUDES) \
        $(CORBA_CXXFLAGS) \
        $(CORBA_INCLUDES) \
        -I$(srcdir)/../SMESHImpl \
        -I$(srcdir)/../MEFISTO2 \
        -I$(srcdir)/../SMESH \
+       -I$(srcdir)/../SMESHUtils \
        -I$(srcdir)/../SMESH_I \
        -I$(srcdir)/../SMESHDS \
        -I$(srcdir)/../SMDS \
        -I$(srcdir)/../Controls \
        -I$(srcdir)/../StdMeshers \
-       -I$(top_builddir)/idl \
-       -I$(top_builddir)/salome_adm/unix
-
+       -I$(top_builddir)/idl
 
 libStdMeshersEngine_la_LDFLAGS  = \
        ../../idl/libSalomeIDLSMESH.la \