Join modifications from branch OCC_development_for_3_2_0a2

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

diff --git a/src/SMESH_I/Makefile.in b/src/SMESH_I/Makefile.in
index a2b64c5dad184cf36e3efaf09fd66f76593f97d7..c8787fdd3ce373b975b3f38f7a624c70587bf8b6 100644 (file)
--- a/src/SMESH_I/Makefile.in
+++ b/src/SMESH_I/Makefile.in
@@ -44,9 +44,11 @@ EXPORT_HEADERS= \
        SMESH_3D_Algo_i.hxx \
        SMESH_subMesh_i.hxx \
        SMESH_Mesh_i.hxx \
-       SMESH_Hypothesis_i.hxx
+       SMESH_Hypothesis_i.hxx \
+       SMESH_PythonDump.hxx \
+       SMESH.hxx
 
-EXPORT_PYSCRIPTS = smeshpy.py SMESH_test.py
+EXPORT_PYSCRIPTS = smeshpy.py
 
 # Libraries targets
 
@@ -55,6 +57,7 @@ LIB= libSMESHEngine.la
 LIB_SRC = \
        SMESH_Gen_i.cxx \
        SMESH_Gen_i_1.cxx \
+       SMESH_DumpPython.cxx \
        SMESH_Mesh_i.cxx \
        SMESH_MEDMesh_i.cxx \
         SMESH_MEDFamily_i.cxx \
@@ -68,34 +71,100 @@ LIB_SRC = \
         SMESH_3D_Algo_i.cxx \
        SMESH_Filter_i.cxx \
        SMESH_Group_i.cxx \
-       SMESH_Pattern_i.cxx
-
-LIB_SERVER_IDL = SMESH_Gen.idl SMESH_Hypothesis.idl SMESH_Mesh.idl \
-                 SALOME_Component.idl SALOME_Exception.idl \
-                 SMESH_Filter.idl SMESH_Group.idl SMESH_Pattern.idl
-
-LIB_CLIENT_IDL = SALOMEDS.idl GEOM_Gen.idl MED.idl SALOMEDS_Attributes.idl SALOME_GenericObj.idl SALOME_Comm.idl
+       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 \
+        SMESH_Filter.idl \
+       SMESH_Group.idl \
+       SMESH_Pattern.idl
+
+LIB_CLIENT_IDL = \
+       SALOMEDS.idl \
+       GEOM_Gen.idl \
+       MED.idl \
+       SALOMEDS_Attributes.idl \
+       SALOME_GenericObj.idl \
+       SALOME_Comm.idl
 
 # Executables targets
 BIN = SMESHEngine
 BIN_SRC = 
 
 # additionnal information to compil and link file
-CPPFLAGS+= $(OCC_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \
-           -I${GEOM_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
-CXXFLAGS+= $(OCC_CXXFLAGS) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_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
-
-
-LDFLAGSFORBIN += -lSMDS -lSMESHDS -lMEDWrapper -lMeshDriver -lMeshDriverMED -lMeshDriverUNV -lMeshDriverDAT -lMeshDriverSTL \
-               -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lRegistry \
-               -lOpUtil -lSALOMELocalTrace -lSalomeNotification \
-               -lSalomeHDFPersist -lSalomeLifeCycleCORBA -lTOOLSDS -lSalomeGenericObj \
-               -L${GEOM_ROOT_DIR}/lib/salome -lGEOMClient -lSMESHimpl -lSMESHControls \
-     -L${CASROOT}/lin/lib -lTKCDF -lTKBO
+CPPFLAGS+= \
+       $(OCC_INCLUDES) \
+       $(HDF5_INCLUDES) \
+       $(BOOST_CPPFLAGS) \
+       -I${KERNEL_ROOT_DIR}/include/salome \
+        -I${MED_ROOT_DIR}/include/salome \
+       -I${GEOM_ROOT_DIR}/include/salome 
+
+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 \
+       -lSalomeContainer \
+       -lSalomeNS \
+       -lRegistry \
+       -lSalomeHDFPersist \
+       -lSalomeLifeCycleCORBA \
+       -lTOOLSDS \
+       -lSalomeGenericObj \
+       -L${GEOM_ROOT_DIR}/lib/salome \
+       -lGEOMClient \
+       -lSMESHimpl \
+       -lSMESHControls \
+       $(OCC_LDPATH) \
+       -lTKCDF \
+       -lTKBO
+
+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 \
+       -lSALOMEBasics \
+       -lSalomeNotification \
+       -lSalomeHDFPersist \
+       -lSalomeLifeCycleCORBA \
+       -lTOOLSDS \
+       -lSalomeGenericObj \
+       -L${GEOM_ROOT_DIR}/lib/salome \
+       -lGEOMClient \
+       -lSMESHimpl \
+       -lSMESHControls \
+       -lNMTTools \
+       -lNMTDS \
+       $(OCC_LDPATH) \
+       -lTKCDF \
+       -lTKBO \
+       -lTKMath
 
 @CONCLUDE@