Join modifications from branch BR_3_1_0deb

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

diff --git a/src/StdMeshers/Makefile.in b/src/StdMeshers/Makefile.in
index b7d66f8d16d7d882d67906250d21d008bf0057a9..592ff2b2b14620ec1ee2ce3755518ca7a51b201a 100644 (file)
--- a/src/StdMeshers/Makefile.in
+++ b/src/StdMeshers/Makefile.in
@@ -23,7 +23,6 @@
 #  File   : Makefile.in
 #  Author : Julia DOROVSKIKH
 #  Module : SMESH
-#  $Header$
 
 top_srcdir=@top_srcdir@
 top_builddir=../..
@@ -35,16 +34,23 @@ VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl
 
 # header files  
 EXPORT_HEADERS = \
-       StdMeshers_LengthFromEdges.hxx \
        StdMeshers_LocalLength.hxx \
+       StdMeshers_StartEndLength.hxx \
+       StdMeshers_Arithmetic1D.hxx \
        StdMeshers_NumberOfSegments.hxx \
+       StdMeshers_Deflection1D.hxx \
+       StdMeshers_Propagation.hxx \
+       StdMeshers_LengthFromEdges.hxx \
        StdMeshers_MaxElementArea.hxx \
        StdMeshers_MaxElementVolume.hxx \
        StdMeshers_NotConformAllowed.hxx \
        StdMeshers_Regular_1D.hxx \
        StdMeshers_Quadrangle_2D.hxx \
        StdMeshers_MEFISTO_2D.hxx \
-       StdMeshers_Hexa_3D.hxx
+       StdMeshers_Hexa_3D.hxx \
+       StdMeshers_AutomaticLength.hxx \
+       StdMeshers_Distribution.hxx \
+       StdMeshers_QuadranglePreference.hxx
 
 EXPORT_PYSCRIPTS =
 
@@ -53,16 +59,24 @@ EXPORT_PYSCRIPTS =
 LIB = libStdMeshers.la
 
 LIB_SRC = \
-       StdMeshers_LengthFromEdges.cxx \
        StdMeshers_LocalLength.cxx \
+       StdMeshers_StartEndLength.cxx \
+       StdMeshers_Arithmetic1D.cxx \
+       StdMeshers_NumberOfSegments.cxx \
+       StdMeshers_Deflection1D.cxx \
+       StdMeshers_Propagation.cxx \
+       StdMeshers_LengthFromEdges.cxx \
        StdMeshers_MaxElementArea.cxx \
        StdMeshers_MaxElementVolume.cxx \
-       StdMeshers_NumberOfSegments.cxx \
        StdMeshers_NotConformAllowed.cxx \
        StdMeshers_Regular_1D.cxx \
        StdMeshers_Quadrangle_2D.cxx \
        StdMeshers_MEFISTO_2D.cxx \
-       StdMeshers_Hexa_3D.cxx
+       StdMeshers_Penta_3D.cxx \
+       StdMeshers_Hexa_3D.cxx \
+       StdMeshers_AutomaticLength.cxx \
+       StdMeshers_Distribution.cxx \
+       StdMeshers_QuadranglePreference.cxx
 
 LIB_SERVER_IDL = 
 
@@ -74,8 +88,9 @@ BIN_SRC =
 
 # additionnal information to compil and link file
 CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
-CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
+CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
 
-LDFLAGS+= -lSMESHimpl -lMEFISTO2D -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGS+= -lSMESHimpl -lMEFISTO2D $(OCC_LDPATH) -lTKAdvTools -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome \
+         -lCASCatch
 
 @CONCLUDE@