From 396fc51070b0aaaaa219c1025869ff2151f23c7c Mon Sep 17 00:00:00 2001 From: mkr Date: Fri, 7 Mar 2008 12:33:50 +0000 Subject: [PATCH] To correct Makefiles according to modifications in check_vtk.m4 file (remove dependences from OGL_LIBS in check_vtk.m4). --- src/CONVERTOR/Makefile.am | 4 ++-- src/OBJECT/Makefile.am | 4 ++-- src/PIPELINE/Makefile.am | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CONVERTOR/Makefile.am b/src/CONVERTOR/Makefile.am index f0782c7c..411873b0 100644 --- 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 555d1cd7..3dcac5f0 100644 --- 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 bb169513..44925dee 100644 --- 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 -- 2.39.2