X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FMakefile.am;h=1739ddf8699de103e830bc240e503216593c7a53;hb=88b3dbe23b236bd1746405155ae33a76aaf59ecd;hp=74d632a6f086376d363fb2cb5ba034b884ad2410;hpb=79b1ac2b6df9117f16f11d444b1f165d477a1813;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/Makefile.am b/src/StdMeshers/Makefile.am
index 74d632a6f..1739ddf86 100644
--- a/src/StdMeshers/Makefile.am
+++ b/src/StdMeshers/Makefile.am
@@ -1,30 +1,28 @@
-#  SMESH StdMeshers : implementaion of SMESH idl descriptions
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003  CEA
-# 
-#  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. 
-# 
-#  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
+# 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.
 #
+# 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
+#
+
+#  SMESH StdMeshers : implementaion of SMESH idl descriptions
 #  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.hxx \
 	StdMeshers_StartEndLength.hxx \
 	StdMeshers_Arithmetic1D.hxx \
+	StdMeshers_FixedPoints1D.hxx \
 	StdMeshers_NumberOfSegments.hxx \
 	StdMeshers_Deflection1D.hxx \
 	StdMeshers_Propagation.hxx \
@@ -43,11 +42,13 @@ salomeinclude_HEADERS = \
 	StdMeshers_Quadrangle_2D.hxx \
 	StdMeshers_MEFISTO_2D.hxx \
 	StdMeshers_Hexa_3D.hxx \
+	StdMeshers_Penta_3D.hxx \
 	StdMeshers_AutomaticLength.hxx \
 	StdMeshers_Distribution.hxx \
 	StdMeshers_QuadranglePreference.hxx \
 	StdMeshers_QuadraticMesh.hxx \
 	StdMeshers_NumberOfLayers.hxx \
+	StdMeshers_NumberOfLayers2D.hxx \
 	StdMeshers_Prism_3D.hxx \
 	StdMeshers_ProjectionSource1D.hxx \
 	StdMeshers_ProjectionSource2D.hxx \
@@ -58,12 +59,27 @@ salomeinclude_HEADERS = \
 	StdMeshers_RadialPrism_3D.hxx  \
 	StdMeshers_ProjectionUtils.hxx \
 	StdMeshers_LayerDistribution.hxx \
+	StdMeshers_LayerDistribution2D.hxx \
 	StdMeshers_SegmentAroundVertex_0D.hxx \
 	StdMeshers_SegmentLengthAroundVertex.hxx \
 	StdMeshers_FaceSide.hxx \
 	StdMeshers_CompositeSegment_1D.hxx \
 	StdMeshers_UseExisting_1D2D.hxx \
-	SMESH_StdMeshers.hxx
+	StdMeshers_QuadToTriaAdaptor.hxx \
+	SMESH_StdMeshers.hxx \
+	StdMeshers_CompositeHexa_3D.hxx \
+	StdMeshers_MaxLength.hxx \
+	StdMeshers_QuadrangleParams.hxx \
+	StdMeshers_RadialQuadrangle_1D2D.hxx \
+	StdMeshers_HexaFromSkin_3D.hxx \
+	StdMeshers_ImportSource.hxx \
+	StdMeshers_Import_1D.hxx \
+	StdMeshers_Import_1D2D.hxx \
+	StdMeshers_ViscousLayers.hxx \
+	StdMeshers_ViscousLayers2D.hxx \
+	StdMeshers_Projection_1D2D.hxx \
+	StdMeshers_CartesianParameters3D.hxx \
+	StdMeshers_Cartesian_3D.hxx
 
 # Libraries targets
 
@@ -73,6 +89,7 @@ dist_libStdMeshers_la_SOURCES = \
 	StdMeshers_LocalLength.cxx \
 	StdMeshers_StartEndLength.cxx \
 	StdMeshers_Arithmetic1D.cxx \
+	StdMeshers_FixedPoints1D.cxx \
 	StdMeshers_NumberOfSegments.cxx \
 	StdMeshers_Deflection1D.cxx \
 	StdMeshers_Propagation.cxx \
@@ -90,6 +107,7 @@ dist_libStdMeshers_la_SOURCES = \
 	StdMeshers_QuadranglePreference.cxx \
 	StdMeshers_QuadraticMesh.cxx \
 	StdMeshers_NumberOfLayers.cxx \
+	StdMeshers_NumberOfLayers2D.cxx \
 	StdMeshers_Prism_3D.cxx \
 	StdMeshers_ProjectionSource1D.cxx \
 	StdMeshers_ProjectionSource2D.cxx \
@@ -100,21 +118,36 @@ dist_libStdMeshers_la_SOURCES = \
 	StdMeshers_RadialPrism_3D.cxx \
 	StdMeshers_ProjectionUtils.cxx \
 	StdMeshers_LayerDistribution.cxx \
+	StdMeshers_LayerDistribution2D.cxx \
 	StdMeshers_SegmentAroundVertex_0D.cxx \
 	StdMeshers_SegmentLengthAroundVertex.cxx \
 	StdMeshers_FaceSide.cxx \
 	StdMeshers_CompositeSegment_1D.cxx \
-	StdMeshers_UseExisting_1D2D.cxx
-
+	StdMeshers_UseExisting_1D2D.cxx \
+	StdMeshers_QuadToTriaAdaptor.cxx \
+	StdMeshers_CompositeHexa_3D.cxx \
+	StdMeshers_MaxLength.cxx \
+	StdMeshers_QuadrangleParams.cxx \
+	StdMeshers_RadialQuadrangle_1D2D.cxx \
+	StdMeshers_HexaFromSkin_3D.cxx \
+	StdMeshers_ImportSource.cxx \
+	StdMeshers_Import_1D.cxx \
+	StdMeshers_Import_1D2D.cxx \
+	StdMeshers_ViscousLayers.cxx \
+	StdMeshers_ViscousLayers2D.cxx \
+	StdMeshers_Projection_1D2D.cxx \
+	StdMeshers_CartesianParameters3D.cxx \
+	StdMeshers_Cartesian_3D.cxx
 
 # additionnal information to compil and link file
 libStdMeshers_la_CPPFLAGS = \
 	$(CAS_CPPFLAGS) \
 	$(BOOST_CPPFLAGS) \
+        $(VTK_INCLUDES) \
 	$(KERNEL_CXXFLAGS) \
 	$(GUI_CXXFLAGS) \
-	-I$(srcdir)/../SMESHImpl \
 	-I$(srcdir)/../MEFISTO2 \
+	-I$(srcdir)/../SMESHUtils \
 	-I$(srcdir)/../SMESH \
 	-I$(srcdir)/../SMESHDS \
 	-I$(srcdir)/../SMDS \
@@ -123,8 +156,12 @@ libStdMeshers_la_CPPFLAGS = \
 
 libStdMeshers_la_LDFLAGS  = \
 	../SMESH/libSMESHimpl.la \
-	../SMESH_I/libSMESHEngine.la \
 	../SMESHDS/libSMESHDS.la \
 	../MEFISTO2/libMEFISTO2D.la \
 	$(KERNEL_LDFLAGS) -lSALOMELocalTrace -lOpUtil \
 	$(CAS_LDPATH) -lTKAdvTools -lTKTopAlgo -lTKG3d
+
+if WITH_TBB
+  libStdMeshers_la_CPPFLAGS += $(TBB_INCLUDES)
+  libStdMeshers_la_LDFLAGS  += $(TBB_LIBS)
+endif