From 87cc5abd48c171c04b3acaad71e0d06d9e2fdb56 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 3 Sep 2013 15:48:30 +0000 Subject: [PATCH] Merge from BR_new_bop3 --- src/SMESH/Makefile.am | 3 +-- src/SMESHClient/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/SMESH/Makefile.am b/src/SMESH/Makefile.am index d92df0a09..845be3f0c 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 ad170b108..5a9809346 100644 --- 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) -- 2.39.2