X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FMakefile.am;h=1739ddf8699de103e830bc240e503216593c7a53;hb=54a7ed03b82204da58a844ba451bb93cdff08e29;hp=9c4ecc095d79dcb7330877d08486b69b0a87c86d;hpb=2c607013a23bd4e7ba07e72e0c04dee2c1209cff;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/Makefile.am b/src/StdMeshers/Makefile.am
index 9c4ecc095..1739ddf86 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
@@ -67,7 +67,6 @@ 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 \
@@ -76,7 +75,11 @@ salomeinclude_HEADERS = \
 	StdMeshers_ImportSource.hxx \
 	StdMeshers_Import_1D.hxx \
 	StdMeshers_Import_1D2D.hxx \
-	StdMeshers_ViscousLayers.hxx
+	StdMeshers_ViscousLayers.hxx \
+	StdMeshers_ViscousLayers2D.hxx \
+	StdMeshers_Projection_1D2D.hxx \
+	StdMeshers_CartesianParameters3D.hxx \
+	StdMeshers_Cartesian_3D.hxx
 
 # Libraries targets
 
@@ -122,7 +125,6 @@ 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 \
@@ -131,8 +133,11 @@ dist_libStdMeshers_la_SOURCES = \
 	StdMeshers_ImportSource.cxx \
 	StdMeshers_Import_1D.cxx \
 	StdMeshers_Import_1D2D.cxx \
-	StdMeshers_ViscousLayers.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 = \
@@ -141,8 +146,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 \
@@ -151,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