Merging with WPdev

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

diff --git a/src/StdMeshers/Makefile.in b/src/StdMeshers/Makefile.in
index 592ff2b2b14620ec1ee2ce3755518ca7a51b201a..87f327472915d870fd56b7df05094e77545b839a 100644 (file)
--- a/src/StdMeshers/Makefile.in
+++ b/src/StdMeshers/Makefile.in
@@ -16,7 +16,7 @@
 #  License along with this library; if not, write to the Free Software 
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 # 
-#  See http://www.salome-platform.org or email : webmaster.salome@opencascade.org
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 #
@@ -50,7 +50,20 @@ EXPORT_HEADERS = \
        StdMeshers_Hexa_3D.hxx \
        StdMeshers_AutomaticLength.hxx \
        StdMeshers_Distribution.hxx \
-       StdMeshers_QuadranglePreference.hxx
+       StdMeshers_QuadranglePreference.hxx \
+       StdMeshers_QuadraticMesh.hxx \
+       StdMeshers_NumberOfLayers.hxx \
+       StdMeshers_Prism_3D.hxx \
+       StdMeshers_ProjectionSource1D.hxx \
+       StdMeshers_ProjectionSource2D.hxx \
+       StdMeshers_ProjectionSource3D.hxx \
+       StdMeshers_Projection_1D.hxx \
+       StdMeshers_Projection_2D.hxx \
+       StdMeshers_Projection_3D.hxx \
+       StdMeshers_RadialPrism_3D.hxx  \
+       StdMeshers_ProjectionUtils.hxx \
+       StdMeshers_LayerDistribution.hxx \
+       SMESH_StdMeshers.hxx
 
 EXPORT_PYSCRIPTS =
 
@@ -76,7 +89,19 @@ LIB_SRC = \
        StdMeshers_Hexa_3D.cxx \
        StdMeshers_AutomaticLength.cxx \
        StdMeshers_Distribution.cxx \
-       StdMeshers_QuadranglePreference.cxx
+       StdMeshers_QuadranglePreference.cxx \
+       StdMeshers_QuadraticMesh.cxx \
+       StdMeshers_NumberOfLayers.cxx \
+       StdMeshers_Prism_3D.cxx \
+       StdMeshers_ProjectionSource1D.cxx \
+       StdMeshers_ProjectionSource2D.cxx \
+       StdMeshers_ProjectionSource3D.cxx \
+       StdMeshers_Projection_1D.cxx \
+       StdMeshers_Projection_2D.cxx \
+       StdMeshers_Projection_3D.cxx \
+       StdMeshers_RadialPrism_3D.cxx \
+       StdMeshers_ProjectionUtils.cxx \
+       StdMeshers_LayerDistribution.cxx
 
 LIB_SERVER_IDL = 
 
@@ -87,10 +112,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) \
+       $(KERNEL_CXXFLAGS)
 
-LDFLAGS+= -lSMESHimpl -lMEFISTO2D $(OCC_LDPATH) -lTKAdvTools -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome \
-         -lCASCatch
+CXXFLAGS+= \
+       $(OCC_CXXFLAGS) \
+       $(KERNEL_CXXFLAGS) \
+       $(GEOM_CXXFLAGS)
+
+LDFLAGS+= \
+       -lSMESHimpl \
+       -lMEFISTO2D \
+       $(OCC_LDPATH) \
+       -lTKAdvTools \
+       $(KERNEL_LDFLAGS) \
+       $(GEOM_LDFLAGS)
 
 @CONCLUDE@