From 9ebdc5c3e2c7fc9fc0f4e15ce7bb5b7911ae5bc0 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 2 Oct 2009 13:42:19 +0000 Subject: [PATCH] Porting to boost 1.37 --- src/CONVERTOR/Makefile.am | 2 +- src/OBJECT/Makefile.am | 3 +-- src/VISU_I/Makefile.am | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/CONVERTOR/Makefile.am b/src/CONVERTOR/Makefile.am index dd1cdc7e..57fee5e4 100644 --- a/src/CONVERTOR/Makefile.am +++ b/src/CONVERTOR/Makefile.am @@ -97,7 +97,7 @@ libVisuConvertor_la_LDFLAGS= \ $(QT_LIBS) \ $(CAS_KERNEL) \ $(CAS_MATH) \ - $(BOOST_LIBS) -lboost_thread@BOOST_LIBSUFFIX@ \ + $(BOOST_LIB_THREAD) \ $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase \ $(GUI_LDFLAGS) -lVTKViewer diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am index 541fda02..9a77cf14 100644 --- a/src/OBJECT/Makefile.am +++ b/src/OBJECT/Makefile.am @@ -72,13 +72,12 @@ libVisuObject_la_CPPFLAGS= \ -I$(srcdir)/../CONVERTOR libVisuObject_la_LDFLAGS= \ - $(BOOST_LIBS) \ $(GUI_LDFLAGS) \ $(KERNEL_LDFLAGS) \ $(VTK_LIBS) libVisuObject_la_LIBADD= \ - -lboost_signals@BOOST_LIBSUFFIX@ \ + $(BOOST_LIB_SIGNALS) \ -lSalomeObject -lqtx -lsuit \ ../PIPELINE/libVisuPipeLine.la \ -lSVTK diff --git a/src/VISU_I/Makefile.am b/src/VISU_I/Makefile.am index 9400a089..6fe5cf25 100644 --- a/src/VISU_I/Makefile.am +++ b/src/VISU_I/Makefile.am @@ -134,7 +134,6 @@ libVISUEngineImpl_la_LDFLAGS= \ $(PYTHON_LIBS) \ $(QT_MT_LIBS) \ $(QWT_LIBS) \ - @BOOST_LIBS@ \ $(KERNEL_LDFLAGS) \ $(GUI_LDFLAGS) \ $(MED_LDFLAGS) \ @@ -142,8 +141,8 @@ libVISUEngineImpl_la_LDFLAGS= \ $(VTK_LIBS) libVISUEngineImpl_la_LIBADD= \ - -lboost_signals@BOOST_LIBSUFFIX@ \ - -lboost_thread@BOOST_LIBSUFFIX@ \ + $(BOOST_LIB_SIGNALS) \ + $(BOOST_LIB_THREAD) \ -lSalomeIDLKernel \ -lSalomeHDFPersist \ -lSalomeGenericObj \ -- 2.39.2