From: jfa Date: Wed, 19 Jun 2013 06:34:27 +0000 (+0000) Subject: Merge from BR_new_bop2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FBR_new_bop3;p=modules%2Fsmesh.git Merge from BR_new_bop2 --- diff --git a/src/SMESH/Makefile.am b/src/SMESH/Makefile.am index 32ad95643..f4621d2a2 100644 --- a/src/SMESH/Makefile.am +++ b/src/SMESH/Makefile.am @@ -96,5 +96,4 @@ libSMESHimpl_la_LDFLAGS = \ ../SMESHUtils/libSMESHUtils.la \ $(BOOST_LIB_THREAD) \ $(BOOST_LIB_SYSTEM) \ - $(GEOM_LDFLAGS) -lNMTTools \ - $(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d -lTKCDF + $(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d -lTKCDF diff --git a/src/SMESHClient/Makefile.am b/src/SMESHClient/Makefile.am index a696d59df..e5cb21302 100644 --- a/src/SMESHClient/Makefile.am +++ b/src/SMESHClient/Makefile.am @@ -68,7 +68,7 @@ libSMESHClient_la_LDFLAGS = \ ../Controls/libSMESHControls.la \ $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \ -lSalomeIDLKernel -lSALOMELocalTrace \ - $(GEOM_LDFLAGS) -lNMTDS -lSalomeIDLGEOM \ + $(GEOM_LDFLAGS) -lSalomeIDLGEOM \ $(MED_LDFLAGS) -lMEDWrapper_V2_2 -lSalomeIDLMED -lMEDWrapper \ $(CAS_KERNEL)