Join modifications from branch OCC_development_for_3_2_0a2

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

diff --git a/src/StdMeshers/Makefile.in b/src/StdMeshers/Makefile.in
index 762fbf70d9236bb8bb702c81e9caf0c2b50795cb..b38a5dcbf5ab8da3239f441c0b2cc5bee748a62e 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=../..
@@ -49,7 +48,11 @@ EXPORT_HEADERS = \
        StdMeshers_Quadrangle_2D.hxx \
        StdMeshers_MEFISTO_2D.hxx \
        StdMeshers_Hexa_3D.hxx \
-       StdMeshers_AutomaticLength.hxx
+       StdMeshers_AutomaticLength.hxx \
+       StdMeshers_Distribution.hxx \
+       StdMeshers_QuadranglePreference.hxx \
+       StdMeshers_Helper.hxx \
+       StdMeshers_QuadraticMesh.hxx
 
 EXPORT_PYSCRIPTS =
 
@@ -73,7 +76,11 @@ LIB_SRC = \
        StdMeshers_MEFISTO_2D.cxx \
        StdMeshers_Penta_3D.cxx \
        StdMeshers_Hexa_3D.cxx \
-       StdMeshers_AutomaticLength.cxx
+       StdMeshers_AutomaticLength.cxx \
+       StdMeshers_Distribution.cxx \
+       StdMeshers_QuadranglePreference.cxx \
+       StdMeshers_Helper.cxx \
+       StdMeshers_QuadraticMesh.cxx
 
 LIB_SERVER_IDL = 
 
@@ -84,9 +91,22 @@ BIN =
 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 -I${GEOM_ROOT_DIR}/include/salome
+CPPFLAGS+= \
+       $(OCC_INCLUDES) \
+       $(BOOST_CPPFLAGS) \
+       -I${KERNEL_ROOT_DIR}/include/salome
 
-LDFLAGS+= -lSMESHimpl -lMEFISTO2D -L${CASROOT}/Linux/lib -lTKAdvTools -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome
+CXXFLAGS+= \
+       $(OCC_CXXFLAGS) \
+       -I${KERNEL_ROOT_DIR}/include/salome \
+       -I${GEOM_ROOT_DIR}/include/salome
+
+LDFLAGS+= \
+       -lSMESHimpl \
+       -lMEFISTO2D \
+       $(OCC_LDPATH) \
+       -lTKAdvTools \
+       -L${KERNEL_ROOT_DIR}/lib/salome \
+       -L${GEOM_ROOT_DIR}/lib/salome
 
 @CONCLUDE@