Merge from BR_new_bop2

diff --git a/src/SMESH/Makefile.am b/src/SMESH/Makefile.am
index 32ad95643c6b449e9aca83713acba7aaceff3cf6..f4621d2a27ffb3669bba74c3d6520d3581abbb93 100644 (file)
--- 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 a696d59dffa4648c2b65ce0abd0c057093cc9f66..e5cb2130240939b605e7df36707e06dddc65130d 100644 (file)
--- 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)