X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FMakefile.in;h=0b2ad34f4a4c88e405d23fd57e109bd83f6bd5de;hp=2f38fc04e4792c8aaa0f02e6a3ce5f2043005881;hb=0dfcacb925acdcb12d4c8532c79235c4e2aa331b;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8

diff --git a/src/SMESH_I/Makefile.in b/src/SMESH_I/Makefile.in
index 2f38fc04e..0b2ad34f4 100644
--- a/src/SMESH_I/Makefile.in
+++ b/src/SMESH_I/Makefile.in
@@ -43,11 +43,11 @@ 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
+	SMESH_Hypothesis_i.hxx \
+	SMESH.hxx
 
-EXPORT_PYSCRIPTS = smeshpy.py SMESH_test.py
+EXPORT_PYSCRIPTS = smeshpy.py
 
 # Libraries targets
 
@@ -55,6 +55,8 @@ 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 \
@@ -62,32 +64,42 @@ 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
-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
-
-#IDLCXXFLAGS+= -Wbtp
-
-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
+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 -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 \
+		-L${MED_ROOT_DIR}/lib/salome -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lMEDWrapper_V2_2 \
+		-lMeshDriver -lMeshDriverMED -lMeshDriverUNV -lMeshDriverDAT -lMeshDriverSTL \
+		-L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lRegistry -lSalomeResourcesManager \
+		-lOpUtil -lSALOMELocalTrace -lSALOMETraceCollector -lSalomeNotification -lCASCatch \
+		-lSalomeHDFPersist -lSalomeLifeCycleCORBA -lTOOLSDS -lSalomeGenericObj \
+	  	-L${GEOM_ROOT_DIR}/lib/salome -lGEOMClient -lSMESHimpl -lSMESHControls -lNMTTools -lNMTDS \
+     -L${CASROOT}/lin/lib -lTKCDF -lTKBO
 
 @CONCLUDE@