Move MEDWrapper to MED module

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

diff --git a/src/SMESH/Makefile.in b/src/SMESH/Makefile.in
index 2d94ab908c5373e9df2c3f7302716fdfae06e4d9..5242617d5fee411cfe4ba2fcecc34f9b433e72b9 100644 (file)
--- a/src/SMESH/Makefile.in
+++ b/src/SMESH/Makefile.in
@@ -25,11 +25,10 @@
 #  Author : Paul RASCLE, EDF
 #  Module : SMESH
 #  $Header$
-
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome
+VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl
 
 
 @COMMENCE@
@@ -40,21 +39,14 @@ EXPORT_HEADERS= \
        SMESH_Mesh.hxx \
        SMESH_subMesh.hxx \
        SMESH_Hypothesis.hxx \
-       SMESH_HypothesisFactory.hxx \
        SMESH_Algo.hxx \
        SMESH_1D_Algo.hxx \
        SMESH_2D_Algo.hxx \
        SMESH_3D_Algo.hxx \
-       SMESH_NumberOfSegments.hxx \
-       SMESH_LocalLength.hxx \
-       SMESH_LengthFromEdges.hxx \
-       SMESH_MaxElementArea.hxx \
-       SMESH_MaxElementVolume.hxx \
-       SMESH_Regular_1D.hxx \
-       SMESH_Quadrangle_2D.hxx \
-       SMESH_MEFISTO_2D.hxx \
-       SMESH_Hexa_3D.hxx \
-       SMESH_HypothesisCreator.hxx
+       SMESH_Group.hxx \
+       SMESH_MeshEditor.hxx \
+       SMESH_Block.hxx \
+       SMESH_Pattern.hxx
 
 EXPORT_PYSCRIPTS =
 
@@ -64,20 +56,15 @@ LIB= libSMESHimpl.la
 
 LIB_SRC = SMESH_Gen.cxx SMESH_Mesh.cxx SMESH_subMesh.cxx \
          SMESH_Hypothesis.cxx \
-          SMESH_HypothesisFactory.cxx \
          SMESH_Algo.cxx \
          SMESH_1D_Algo.cxx \
          SMESH_2D_Algo.cxx \
          SMESH_3D_Algo.cxx \
-         SMESH_NumberOfSegments.cxx \
-         SMESH_LocalLength.cxx \
-         SMESH_LengthFromEdges.cxx \
-         SMESH_MaxElementArea.cxx \
-         SMESH_MaxElementVolume.cxx \
-         SMESH_Regular_1D.cxx \
-         SMESH_Quadrangle_2D.cxx \
-         SMESH_MEFISTO_2D.cxx \
-         SMESH_Hexa_3D.cxx
+         SMESH_Group.cxx \
+         SMESH_MeshEditor.cxx \
+         SMESH_Block.cxx \
+         SMESH_Pattern.cxx \
+          SMESH_HypoFilter.cxx
 
 LIB_SERVER_IDL = 
 
@@ -87,13 +74,12 @@ LIB_CLIENT_IDL =
 BIN = 
 BIN_SRC = 
 
-# additionnal information to compil and link file
-CPPFLAGS+= $(OCC_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
-CXXFLAGS+= $(OCC_CXXFLAGS) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
-
-#IDLCXXFLAGS+= -Wbtp
-
-LDFLAGS+= $(HDF5_LIBS) $(MED2_LIBS) -lOpUtil -lSMESHDS -lSMDS -lMEFISTO2D -lMeshDriverDAT -lMeshDriverMED -lMeshDriverUNV -L${KERNEL_ROOT_DIR}/lib/salome
+# additionnal information to compile and link file
+CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \
+           -I${MED_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
+CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \
+           -I${MED_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
+LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -L${MED_ROOT_DIR}/lib/salome -lNMTTools -lSMESHDS -lMeshDriverDAT -lMeshDriverSTL -lMeshDriverMED -lMeshDriverUNV
 
 @CONCLUDE@