X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FMakefile.am;h=e831115fa0fa62d2afc4bc91b6ae74b182accc67;hb=9eedde53dde017d4e17bd4c4c9fae50af999d372;hp=5a09613bdf9e74d1d2f03938695770e29f7a28a6;hpb=c58c3faf74c93c073933d4f262037ea44928078b;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/Makefile.am b/src/StdMeshers/Makefile.am
index 5a09613bd..e831115fa 100644
--- a/src/StdMeshers/Makefile.am
+++ b/src/StdMeshers/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2011  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
@@ -45,6 +45,7 @@ salomeinclude_HEADERS = \
 	StdMeshers_Penta_3D.hxx \
 	StdMeshers_AutomaticLength.hxx \
 	StdMeshers_Distribution.hxx \
+	StdMeshers_QuadranglePreference.hxx \
 	StdMeshers_QuadraticMesh.hxx \
 	StdMeshers_NumberOfLayers.hxx \
 	StdMeshers_NumberOfLayers2D.hxx \
@@ -74,7 +75,10 @@ salomeinclude_HEADERS = \
 	StdMeshers_ImportSource.hxx \
 	StdMeshers_Import_1D.hxx \
 	StdMeshers_Import_1D2D.hxx \
-	StdMeshers_ViscousLayers.hxx
+	StdMeshers_ViscousLayers.hxx \
+	StdMeshers_Projection_1D2D.hxx \
+	StdMeshers_CartesianParameters3D.hxx \
+	StdMeshers_Cartesian_3D.hxx
 
 # Libraries targets
 
@@ -99,6 +103,7 @@ dist_libStdMeshers_la_SOURCES = \
 	StdMeshers_Hexa_3D.cxx \
 	StdMeshers_AutomaticLength.cxx \
 	StdMeshers_Distribution.cxx \
+	StdMeshers_QuadranglePreference.cxx \
 	StdMeshers_QuadraticMesh.cxx \
 	StdMeshers_NumberOfLayers.cxx \
 	StdMeshers_NumberOfLayers2D.cxx \
@@ -127,8 +132,10 @@ dist_libStdMeshers_la_SOURCES = \
 	StdMeshers_ImportSource.cxx \
 	StdMeshers_Import_1D.cxx \
 	StdMeshers_Import_1D2D.cxx \
-	StdMeshers_ViscousLayers.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 = \
@@ -137,8 +144,8 @@ libStdMeshers_la_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 \
@@ -147,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