Join modifications from V3_2_0_maintainance (V3_2_6pre4 - T32x_16Aug2007_16h00m)

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

diff --git a/src/StdMeshers/Makefile.am b/src/StdMeshers/Makefile.am
index 870c426feb008078b6308de809c5ae930368bc9c..d05ea4dbb770731456ebee0a2a3858019eb80ba5 100644 (file)
--- a/src/StdMeshers/Makefile.am
+++ b/src/StdMeshers/Makefile.am
@@ -61,7 +61,7 @@ salomeinclude_HEADERS = \
        StdMeshers_CompositeSegment_1D.hxx \
        StdMeshers_FaceSide.hxx \
        StdMeshers_SegmentAroundVertex_0D.hxx \
-       StdMeshers_SegmentLengthAroundVertex_0D.hxx \
+       StdMeshers_SegmentLengthAroundVertex.hxx \
        SMESH_StdMeshers.hxx
 
 # Libraries targets
@@ -102,7 +102,8 @@ dist_libStdMeshers_la_SOURCES = \
        StdMeshers_CompositeSegment_1D.cxx \
        StdMeshers_FaceSide.cxx \
        StdMeshers_SegmentAroundVertex_0D.cxx \
-       StdMeshers_SegmentLengthAroundVertex_0D.cxx
+       StdMeshers_SegmentLengthAroundVertex.cxx
+
 
 # additionnal information to compil and link file
 libStdMeshers_la_CPPFLAGS = \
@@ -114,7 +115,8 @@ libStdMeshers_la_CPPFLAGS = \
        -I$(srcdir)/../SMESH \
        -I$(srcdir)/../SMESHDS \
        -I$(srcdir)/../SMDS \
-       -I$(srcdir)/../Controls
+       -I$(srcdir)/../Controls \
+       @PLATFORM_INCLUDES@
 
 libStdMeshers_la_LDFLAGS  = \
        ../SMESH/libSMESHimpl.la \
@@ -122,4 +124,4 @@ libStdMeshers_la_LDFLAGS  = \
        ../SMESHDS/libSMESHDS.la \
        ../MEFISTO2/libMEFISTO2D.la \
        $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lOpUtil \
-       $(OCC_LDPATH) -lTKAdvTools -lTKTopAlgo -lTKG3d
+       $(CAS_LDPATH) -lTKAdvTools -lTKTopAlgo -lTKG3d