Merge with version on tag OCC-V2_1_0d

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

diff --git a/src/SMESH_I/Makefile.in b/src/SMESH_I/Makefile.in
index 2f38fc04e4792c8aaa0f02e6a3ce5f2043005881..a2b64c5dad184cf36e3efaf09fd66f76593f97d7 100644 (file)
--- a/src/SMESH_I/Makefile.in
+++ b/src/SMESH_I/Makefile.in
@@ -43,7 +43,6 @@ EXPORT_HEADERS= \
        SMESH_2D_Algo_i.hxx \
        SMESH_3D_Algo_i.hxx \
        SMESH_subMesh_i.hxx \
-       SMESH_topo.hxx \
        SMESH_Mesh_i.hxx \
        SMESH_Hypothesis_i.hxx
 
@@ -55,6 +54,7 @@ LIB= libSMESHEngine.la
 
 LIB_SRC = \
        SMESH_Gen_i.cxx \
+       SMESH_Gen_i_1.cxx \
        SMESH_Mesh_i.cxx \
        SMESH_MEDMesh_i.cxx \
         SMESH_MEDFamily_i.cxx \
@@ -62,22 +62,22 @@ LIB_SRC = \
         SMESH_subMesh_i.cxx \
         SMESH_MeshEditor_i.cxx \
         SMESH_Hypothesis_i.cxx \
-        SMESH_topo.cxx \
         SMESH_Algo_i.cxx \
         SMESH_1D_Algo_i.cxx \
         SMESH_2D_Algo_i.cxx \
         SMESH_3D_Algo_i.cxx \
        SMESH_Filter_i.cxx \
-       SMESH_Group_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_Filter.idl SMESH_Group.idl SMESH_Pattern.idl
 
-LIB_CLIENT_IDL = SALOMEDS.idl GEOM_Gen.idl GEOM_Shape.idl MED.idl SALOMEDS_Attributes.idl SALOME_GenericObj.idl
+LIB_CLIENT_IDL = SALOMEDS.idl GEOM_Gen.idl MED.idl SALOMEDS_Attributes.idl SALOME_GenericObj.idl SALOME_Comm.idl
 
 # Executables targets
-BIN = 
+BIN = SMESHEngine
 BIN_SRC = 
 
 # additionnal information to compil and link file
@@ -86,8 +86,16 @@ CPPFLAGS+= $(OCC_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR
 CXXFLAGS+= $(OCC_CXXFLAGS) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \
            -I${GEOM_ROOT_DIR}/include/salome
 
-#IDLCXXFLAGS+= -Wbtp
+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
 
-LDFLAGS+= $(HDF5_LIBS) $(MED2_LIBS) -lSMESHimpl -lSalomeContainer -lSalomeNS -lSalomeDS -lRegistry -lSalomeHDFPersist -lOpUtil -lGEOMClient -lSMESHDS -lSMDS -lMeshDriverMED -lSalomeLifeCycleCORBA -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeGenericObj
+
+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
 
 @CONCLUDE@