Merge from V6_5_BR 05/06/2012

[modules/smesh.git] / src / StdMeshers / Makefile.am

diff --git a/src/StdMeshers/Makefile.am b/src/StdMeshers/Makefile.am
index 3d2720b69fa3a429f8764a1fc44558931f35c674..e831115fa0fa62d2afc4bc91b6ae74b182accc67 100644 (file)
--- 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
@@ -75,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
 
@@ -129,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 = \
@@ -153,3 +158,8 @@ libStdMeshers_la_LDFLAGS  = \
        ../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