From: nri <nri@opencascade.com>
Date: Thu, 10 Jul 2003 15:04:17 +0000 (+0000)
Subject: NRI : Merge from V1_2.
X-Git-Tag: V1_2_1~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ebd78fd52911940a7f3ac75745eb5ac36c5e293c;p=modules%2Fsmesh.git

NRI : Merge from V1_2.
---

diff --git a/src/SMESH/Makefile.in b/src/SMESH/Makefile.in
index 173e36516..2d94ab908 100644
--- a/src/SMESH/Makefile.in
+++ b/src/SMESH/Makefile.in
@@ -93,7 +93,7 @@ CXXFLAGS+= $(OCC_CXXFLAGS) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR
 
 #IDLCXXFLAGS+= -Wbtp
 
-LDFLAGS+=  $(OCC_LIBS) $(HDF5_LIBS) $(MED2_LIBS) -lOpUtil -lSMESHDS -lSMDS -lMEFISTO2D -lMeshDriverDAT -lMeshDriverMED -lMeshDriverUNV -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGS+= $(HDF5_LIBS) $(MED2_LIBS) -lOpUtil -lSMESHDS -lSMDS -lMEFISTO2D -lMeshDriverDAT -lMeshDriverMED -lMeshDriverUNV -L${KERNEL_ROOT_DIR}/lib/salome
 
 @CONCLUDE@
 
diff --git a/src/SMESH_I/Makefile.in b/src/SMESH_I/Makefile.in
index abe5d1777..2ed45ada3 100644
--- a/src/SMESH_I/Makefile.in
+++ b/src/SMESH_I/Makefile.in
@@ -76,7 +76,7 @@ CXXFLAGS+= $(OCC_CXXFLAGS) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR
 
 #IDLCXXFLAGS+= -Wbtp
 
-LDFLAGS+=  $(OCC_LIBS) $(HDF5_LIBS) $(MED2_LIBS) -lSMESHimpl -lSalomeContainer -lSalomeNS -lSalomeDS -lRegistry -lSalomeHDFPersist -lOpUtil -lGEOMClient -lSMESHDS -lSMDS -lMEFISTO2D -lMeshDriverMED -lSalomeLifeCycleCORBA -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome
+LDFLAGS+= $(HDF5_LIBS) $(MED2_LIBS) -lSMESHimpl -lSalomeContainer -lSalomeNS -lSalomeDS -lRegistry -lSalomeHDFPersist -lOpUtil -lGEOMClient -lSMESHDS -lSMDS -lMEFISTO2D -lMeshDriverMED -lSalomeLifeCycleCORBA -L${KERNEL_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome
 
 @CONCLUDE@