Merge from OCC_development_generic_2006

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

diff --git a/src/SMESH_I/Makefile.in b/src/SMESH_I/Makefile.in
index af407e6e9458d332c326abebe5cff6c18b885d08..179743728f2e261f52fee67696d53bce8f39c8bb 100644 (file)
--- a/src/SMESH_I/Makefile.in
+++ b/src/SMESH_I/Makefile.in
@@ -45,6 +45,7 @@ EXPORT_HEADERS= \
        SMESH_subMesh_i.hxx \
        SMESH_Mesh_i.hxx \
        SMESH_Hypothesis_i.hxx \
+       SMESH_PythonDump.hxx \
        SMESH.hxx
 
 EXPORT_PYSCRIPTS = smeshpy.py
@@ -70,7 +71,8 @@ LIB_SRC = \
         SMESH_3D_Algo_i.cxx \
        SMESH_Filter_i.cxx \
        SMESH_Group_i.cxx \
-       SMESH_Pattern_i.cxx
+       SMESH_Pattern_i.cxx \
+       SMESH_2smeshpy.cxx
 
 LIB_SERVER_IDL = SMESH_Gen.idl SMESH_Hypothesis.idl SMESH_Mesh.idl \
                  SALOME_Component.idl SALOME_Exception.idl \
@@ -84,21 +86,22 @@ BIN_SRC =
 
 # additionnal information to compil and link file
 CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \
-           -I${GEOM_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
+           -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${GEOM_ROOT_DIR}/include/salome
+           -I${MED_ROOT_DIR}/include/salome -I${GEOM_ROOT_DIR}/include/salome
 
 LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lRegistry -lSalomeHDFPersist -lSalomeLifeCycleCORBA -lTOOLSDS -lSalomeGenericObj \
          -L${GEOM_ROOT_DIR}/lib/salome -lGEOMClient -lSMESHimpl -lSMESHControls \
-    -L${CASROOT}/lin/lib -lTKCDF -lTKBO
+    $(OCC_LDPATH) -lTKCDF -lTKBO
 
 
-LDFLAGSFORBIN += -lSMDS -lSMESHDS -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lMEDWrapper_V2_2 \
+LDFLAGSFORBIN += -lSMDS -lSMESHDS \
+               -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lMEDWrapper_V2_2 -lmed_V2_1 \
                -lMeshDriver -lMeshDriverMED -lMeshDriverUNV -lMeshDriverDAT -lMeshDriverSTL \
                -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lRegistry -lSalomeResourcesManager \
-               -lOpUtil -lSALOMELocalTrace -lSALOMETraceCollector -lSalomeNotification -lCASCatch \
+               -lOpUtil -lSALOMELocalTrace -lSALOMEBasics -lSalomeNotification -lCASCatch \
                -lSalomeHDFPersist -lSalomeLifeCycleCORBA -lTOOLSDS -lSalomeGenericObj \
                -L${GEOM_ROOT_DIR}/lib/salome -lGEOMClient -lSMESHimpl -lSMESHControls -lNMTTools -lNMTDS \
-     -L${CASROOT}/lin/lib -lTKCDF -lTKBO
+     $(OCC_LDPATH) -lTKCDF -lTKBO -lTKMath
 
 @CONCLUDE@