X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FMakefile.in;h=2558e560fad7d6751b48b42b289f4d2f3c82696c;hp=c8787fdd3ce373b975b3f38f7a624c70587bf8b6;hb=c63ee099ad2b149bd70136839c973e8910137bc5;hpb=7cab0901cbf9895ce79a5af2390f310136a94802;ds=sidebyside

diff --git a/src/SMESH_I/Makefile.in b/src/SMESH_I/Makefile.in
index c8787fdd3..2558e560f 100644
--- a/src/SMESH_I/Makefile.in
+++ b/src/SMESH_I/Makefile.in
@@ -17,7 +17,7 @@
 #  License along with this library; if not, write to the Free Software 
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 # 
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #
 #
@@ -60,15 +60,15 @@ LIB_SRC = \
 	SMESH_DumpPython.cxx \
 	SMESH_Mesh_i.cxx \
 	SMESH_MEDMesh_i.cxx \
-        SMESH_MEDFamily_i.cxx \
+	SMESH_MEDFamily_i.cxx \
 	SMESH_MEDSupport_i.cxx \
-        SMESH_subMesh_i.cxx \
-        SMESH_MeshEditor_i.cxx \
-        SMESH_Hypothesis_i.cxx \
-        SMESH_Algo_i.cxx \
-        SMESH_1D_Algo_i.cxx \
-        SMESH_2D_Algo_i.cxx \
-        SMESH_3D_Algo_i.cxx \
+	SMESH_subMesh_i.cxx \
+	SMESH_MeshEditor_i.cxx \
+	SMESH_Hypothesis_i.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_Pattern_i.cxx \
@@ -78,9 +78,9 @@ LIB_SERVER_IDL = \
 	SMESH_Gen.idl \
 	SMESH_Hypothesis.idl \
 	SMESH_Mesh.idl \
-        SALOME_Component.idl \
+	SALOME_Component.idl \
 	SALOME_Exception.idl \
-        SMESH_Filter.idl \
+	SMESH_Filter.idl \
 	SMESH_Group.idl \
 	SMESH_Pattern.idl
 
@@ -101,19 +101,20 @@ 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 
+	$(KERNEL_CXXFLAGS) \
+	$(MED_CXXFLAGS) \
+	$(GEOM_CXXFLAGS)
 
 CXXFLAGS+= \
+	$(OCC_INCLUDES) \
 	$(OCC_CXXFLAGS) \
 	$(HDF5_INCLUDES) \
-	-I${KERNEL_ROOT_DIR}/include/salome \
-        -I${MED_ROOT_DIR}/include/salome \
-	-I${GEOM_ROOT_DIR}/include/salome
+	$(KERNEL_CXXFLAGS) \
+	$(MED_CXXFLAGS) \
+	$(GEOM_CXXFLAGS)
 
 LDFLAGS+= \
-	-L${KERNEL_ROOT_DIR}/lib/salome \
+	$(KERNEL_LDFLAGS) \
 	-lSalomeContainer \
 	-lSalomeNS \
 	-lRegistry \
@@ -121,18 +122,19 @@ LDFLAGS+= \
 	-lSalomeLifeCycleCORBA \
 	-lTOOLSDS \
 	-lSalomeGenericObj \
-	-L${GEOM_ROOT_DIR}/lib/salome \
+	$(GEOM_LDFLAGS) \
 	-lGEOMClient \
 	-lSMESHimpl \
 	-lSMESHControls \
 	$(OCC_LDPATH) \
 	-lTKCDF \
-	-lTKBO
+	-lTKBO \
+	-lTKShHealing
 
 LDFLAGSFORBIN+= \
 	-lSMDS \
 	-lSMESHDS \
-	-L${MED_ROOT_DIR}/lib/salome \
+	$(MED_LDFLAGS) \
 	-lMEDWrapper \
 	-lMEDWrapperBase \
 	-lMEDWrapper_V2_1 \
@@ -143,7 +145,7 @@ LDFLAGSFORBIN+= \
 	-lMeshDriverUNV \
 	-lMeshDriverDAT \
 	-lMeshDriverSTL \
-	-L${KERNEL_ROOT_DIR}/lib/salome \
+	$(KERNEL_LDFLAGS) \
 	-lSalomeContainer \
 	-lSalomeNS \
 	-lRegistry \
@@ -156,7 +158,7 @@ LDFLAGSFORBIN+= \
 	-lSalomeLifeCycleCORBA \
 	-lTOOLSDS \
 	-lSalomeGenericObj \
-	-L${GEOM_ROOT_DIR}/lib/salome \
+	$(GEOM_LDFLAGS) \
 	-lGEOMClient \
 	-lSMESHimpl \
 	-lSMESHControls \
@@ -165,6 +167,7 @@ LDFLAGSFORBIN+= \
 	$(OCC_LDPATH) \
 	-lTKCDF \
 	-lTKBO \
-	-lTKMath
+	-lTKMath \
+	-lTKShHealing
 
 @CONCLUDE@