X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FMakefile.am;h=e831115fa0fa62d2afc4bc91b6ae74b182accc67;hb=16fcf4dea0b9901aa6345f13b629c72f46b139da;hp=c10d17e667ffd4ccf8eac3f1a42841d2dea40f06;hpb=3add66f2196c5b8e04e69d87c9f6a28e9a9a2eb2;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/Makefile.am b/src/StdMeshers/Makefile.am
index c10d17e66..e831115fa 100644
--- a/src/StdMeshers/Makefile.am
+++ b/src/StdMeshers/Makefile.am
@@ -1,24 +1,22 @@
-#  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 : implementaion of SMESH idl descriptions
 #  File   : Makefile.in
 #  Author : Julia DOROVSKIKH
@@ -69,11 +67,18 @@ salomeinclude_HEADERS = \
 	StdMeshers_UseExisting_1D2D.hxx \
 	StdMeshers_QuadToTriaAdaptor.hxx \
 	SMESH_StdMeshers.hxx \
-	StdMeshers_TrianglePreference.hxx \
 	StdMeshers_CompositeHexa_3D.hxx \
 	StdMeshers_MaxLength.hxx \
 	StdMeshers_QuadrangleParams.hxx \
-	StdMeshers_RadialQuadrangle_1D2D.hxx
+	StdMeshers_RadialQuadrangle_1D2D.hxx \
+	StdMeshers_HexaFromSkin_3D.hxx \
+	StdMeshers_ImportSource.hxx \
+	StdMeshers_Import_1D.hxx \
+	StdMeshers_Import_1D2D.hxx \
+	StdMeshers_ViscousLayers.hxx \
+	StdMeshers_Projection_1D2D.hxx \
+	StdMeshers_CartesianParameters3D.hxx \
+	StdMeshers_Cartesian_3D.hxx
 
 # Libraries targets
 
@@ -119,21 +124,28 @@ dist_libStdMeshers_la_SOURCES = \
 	StdMeshers_CompositeSegment_1D.cxx \
 	StdMeshers_UseExisting_1D2D.cxx \
 	StdMeshers_QuadToTriaAdaptor.cxx \
-	StdMeshers_TrianglePreference.cxx \
 	StdMeshers_CompositeHexa_3D.cxx \
 	StdMeshers_MaxLength.cxx \
 	StdMeshers_QuadrangleParams.cxx \
-	StdMeshers_RadialQuadrangle_1D2D.cxx
-
+	StdMeshers_RadialQuadrangle_1D2D.cxx \
+	StdMeshers_HexaFromSkin_3D.cxx \
+	StdMeshers_ImportSource.cxx \
+	StdMeshers_Import_1D.cxx \
+	StdMeshers_Import_1D2D.cxx \
+	StdMeshers_ViscousLayers.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 \
@@ -142,8 +154,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