Merge from V6_4_BR 05/12/2011

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

diff --git a/src/StdMeshers/Makefile.am b/src/StdMeshers/Makefile.am
index 9c4ecc095d79dcb7330877d08486b69b0a87c86d..8f77a44996828c8f40971300be3c4bf30e7c8ae8 100644 (file)
--- a/src/StdMeshers/Makefile.am
+++ b/src/StdMeshers/Makefile.am
@@ -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,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
 
@@ -122,7 +124,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 +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 = \
@@ -141,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 \
@@ -151,7 +154,6 @@ libStdMeshers_la_CPPFLAGS = \
 
 libStdMeshers_la_LDFLAGS  = \
        ../SMESH/libSMESHimpl.la \
-       ../SMESH_I/libSMESHEngine.la \
        ../SMESHDS/libSMESHDS.la \
        ../MEFISTO2/libMEFISTO2D.la \
        $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lOpUtil \