To correct Makefiles according to modifications in check_vtk.m4 file (remove dependen...

diff --git a/src/CONVERTOR/Makefile.am b/src/CONVERTOR/Makefile.am
index f0782c7caae0ee6137f773e38d0193495bdcb87d..411873b0973b77a9253ca40216068ec7a67bae4a 100644 (file)
--- a/src/CONVERTOR/Makefile.am
+++ b/src/CONVERTOR/Makefile.am
@@ -84,13 +84,13 @@ libVisuConvertor_la_CPPFLAGS= \
 
 
 libVisuConvertor_la_LDFLAGS= \
-       $(VTK_LIBS) \
        $(QT_LIBS) \
        $(CAS_KERNEL) \
        $(CAS_MATH) \
        $(BOOST_LIBS) -lboost_thread@BOOST_LIBSUFFIX@ \
        $(MED_LDFLAGS) -lMEDWrapper \
-       $(GUI_LDFLAGS) -lVTKViewer
+       $(GUI_LDFLAGS) -lVTKViewer \
+       $(VTK_LIBS)
 
 # Executables targets
 bin_PROGRAMS= VISUConvertor

diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am
index 555d1cd73fb775a1fa69faaecc5744788a92147d..3dcac5f02b28ac65570744363a33760fbadafcd1 100644 (file)
--- a/src/OBJECT/Makefile.am
+++ b/src/OBJECT/Makefile.am
@@ -63,10 +63,10 @@ libVisuObject_la_CPPFLAGS= \
        -I$(srcdir)/../CONVERTOR
 
 libVisuObject_la_LDFLAGS= \
-       $(VTK_LIBS)  \
        $(BOOST_LIBS) \
        $(GUI_LDFLAGS) \
-       $(KERNEL_LDFLAGS)
+       $(KERNEL_LDFLAGS) \
+       $(VTK_LIBS)
 
 libVisuObject_la_LIBADD=  \
        -lboost_signals@BOOST_LIBSUFFIX@ \

diff --git a/src/PIPELINE/Makefile.am b/src/PIPELINE/Makefile.am
index bb169513ede54750709e593eae0164cd375e37b6..44925dee7a7c9a4e1e8ab17ea31d8a52b0c5eaf3 100644 (file)
--- a/src/PIPELINE/Makefile.am
+++ b/src/PIPELINE/Makefile.am
@@ -106,11 +106,11 @@ libVisuPipeLine_la_CPPFLAGS= \
        -I$(srcdir)/../CONVERTOR
 
 libVisuPipeLine_la_LDFLAGS= \
-       $(VTK_LIBS) -lVTKViewer \
        $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
        $(GUI_LDFLAGS) \
        $(MED_LDFLAGS) \
-       ../CONVERTOR/libVisuConvertor.la
+       ../CONVERTOR/libVisuConvertor.la \
+       $(VTK_LIBS) -lVTKViewer
 
 
 # Executables targets