Merge from BR_new_bop3

diff --git a/src/SMESH/Makefile.am b/src/SMESH/Makefile.am
index d92df0a097828ecaec8867fe21f80e8351e77182..845be3f0c00d2884851b36de3553478895d5e128 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 ad170b108f9bfd40c22bed8d5071ef4584c2c8a1..5a9809346747cf80ac08597069181daf2f6ad747 100644 (file)
--- a/src/SMESHClient/Makefile.am
+++ b/src/SMESHClient/Makefile.am
@@ -72,7 +72,7 @@ libSMESHClient_la_LDFLAGS  = \
        $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics -lSalomeContainer -lSalomeHDFPersist -lSalomeGenericObj \
        -lRegistry -lResourcesManager -lSalomeResourcesManager -lSalomeNotification \
        -lSalomeIDLKernel -lSALOMELocalTrace \
-       $(GEOM_LDFLAGS) -lNMTDS -lSalomeIDLGEOM \
+       $(GEOM_LDFLAGS) -lSalomeIDLGEOM \
        $(CAS_KERNEL)