]> SALOME platform Git repositories - modules/visu.git/commitdiff
Salome HOME
Fix wrong linking to the native libraries V5_1_main_20091127
authorvsr <vsr@opencascade.com>
Thu, 26 Nov 2009 14:59:08 +0000 (14:59 +0000)
committervsr <vsr@opencascade.com>
Thu, 26 Nov 2009 14:59:08 +0000 (14:59 +0000)
src/GUITOOLS/Makefile.am
src/VISU_I/Makefile.am

index 3d844b0cf897e98cac36f2b137af4a741f0c1fdc..3182f1a8880af0009ea3c03a98ab905c8b20cadd 100644 (file)
@@ -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
index 6d339fbb1b993e47638f7663e4be609a319efaa0..9d6c9de56584cf778d8725c3781568cb18426622 100644 (file)
@@ -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)