From 026158bacf52a6954527b5e4e61155a99a9a93db Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 26 Nov 2009 14:59:08 +0000 Subject: [PATCH] Fix wrong linking to the native libraries --- src/GUITOOLS/Makefile.am | 3 +-- src/VISU_I/Makefile.am | 20 +++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/GUITOOLS/Makefile.am b/src/GUITOOLS/Makefile.am index 3d844b0c..3182f1a8 100644 --- a/src/GUITOOLS/Makefile.am +++ b/src/GUITOOLS/Makefile.am @@ -46,5 +46,4 @@ libVISUGUITOOLS_la_CPPFLAGS= -ftemplate-depth-32 \ libVISUGUITOOLS_la_LDFLAGS= \ $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(GUI_LDFLAGS) -lCAM -lsuit -lqtx \ - $(QT_LIBS) $(QWT_LIBS) + $(GUI_LDFLAGS) -lCAM -lsuit -lqtx diff --git a/src/VISU_I/Makefile.am b/src/VISU_I/Makefile.am index 6d339fbb..9d6c9de5 100644 --- a/src/VISU_I/Makefile.am +++ b/src/VISU_I/Makefile.am @@ -135,20 +135,22 @@ libVISUEngineImpl_la_CPPFLAGS= \ -I$(top_builddir)/idl libVISUEngineImpl_la_LDFLAGS= \ + $(KERNEL_LDFLAGS) \ + $(GUI_LDFLAGS) \ + $(MED_LDFLAGS) \ + ../../idl/libSalomeIDLVISU.la \ $(PYTHON_LIBS) \ $(BOOST_LIB_SIGNALS) \ $(BOOST_LIB_THREAD) \ $(BOOST_LIB_SYSTEM) \ $(BOOST_LIB_FILESYSTEM) \ - $(QT_MT_LIBS) \ - $(QWT_LIBS) \ - $(KERNEL_LDFLAGS) \ - $(GUI_LDFLAGS) \ - $(MED_LDFLAGS) \ - ../../idl/libSalomeIDLVISU.la \ $(VTK_LIBS) libVISUEngineImpl_la_LIBADD= \ + ../CONVERTOR/libVisuConvertor.la \ + ../PIPELINE/libVisuPipeLine.la \ + ../OBJECT/libVisuObject.la \ + ../GUITOOLS/libVISUGUITOOLS.la \ -lSalomeIDLKernel \ -lSalomeHDFPersist \ -lSalomeGenericObj \ @@ -167,11 +169,7 @@ libVISUEngineImpl_la_LIBADD= \ -lSPlot2d \ -lqtx \ -lLightApp \ - -lstd \ - ../CONVERTOR/libVisuConvertor.la \ - ../PIPELINE/libVisuPipeLine.la \ - ../OBJECT/libVisuObject.la \ - ../GUITOOLS/libVISUGUITOOLS.la + -lstd if MED_ENABLE_MULTIPR libVISUEngineImpl_la_CPPFLAGS+= $(MULTIPR_CPPFLAGS) -- 2.39.2