From f26eeda36532b9196539f02bf6ae27163d6c4c06 Mon Sep 17 00:00:00 2001 From: mkr Date: Fri, 7 Mar 2008 12:26:29 +0000 Subject: [PATCH] To correct Makefiles according to modifications in check_vtk.m4 file (remove dependences from OGL_LIBS in check_vtk.m4). --- src/SVTK/Makefile.am | 4 ++-- src/VTKViewer/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SVTK/Makefile.am b/src/SVTK/Makefile.am index 5f151f3b6..283d63a70 100755 --- a/src/SVTK/Makefile.am +++ b/src/SVTK/Makefile.am @@ -119,9 +119,9 @@ libSVTK_la_CPPFLAGS= \ -I$(srcdir)/../VTKViewer libSVTK_la_LDFLAGS= \ - $(VTK_LIBS) \ $(QT_MT_LIBS) \ - $(CAS_KERNEL) $(CAS_VIEWER) + $(CAS_KERNEL) $(CAS_VIEWER) \ + $(VTK_LIBS) $(OGL_LIBS) libSVTK_la_LIBADD= ../Qtx/libqtx.la ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la \ ../Prs/libSalomePrs.la ../VTKViewer/libVTKViewer.la diff --git a/src/VTKViewer/Makefile.am b/src/VTKViewer/Makefile.am index 33c9beb9a..1d32bce34 100755 --- a/src/VTKViewer/Makefile.am +++ b/src/VTKViewer/Makefile.am @@ -99,7 +99,7 @@ nodist_salomeres_DATA= \ libVTKViewer_la_CPPFLAGS=$(QT_INCLUDES) $(VTK_INCLUDES) $(CAS_CPPFLAGS) \ -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT -libVTKViewer_la_LDFLAGS=$(VTK_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) \ +libVTKViewer_la_LDFLAGS=$(QT_MT_LIBS) $(CAS_KERNEL) $(VTK_LIBS) $(OGL_LIBS) \ ../Qtx/libqtx.la ../SUIT/libsuit.la # Executable -- 2.39.2