From eb9418695862efec31c12363908a57283e900edb Mon Sep 17 00:00:00 2001 From: ana Date: Thu, 12 Jan 2012 13:52:46 +0000 Subject: [PATCH] Allocation of vtkEDFCutter in a separate vtkTools library --- adm_local/unix/config_files/check_GUI.m4 | 2 +- tools/vtkEDFOverloads/Makefile.am | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/adm_local/unix/config_files/check_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4 index 7b6408bae..d07f1b367 100755 --- a/adm_local/unix/config_files/check_GUI.m4 +++ b/adm_local/unix/config_files/check_GUI.m4 @@ -74,7 +74,7 @@ else GUI_ROOT_DIR=${SALOME_GUI_DIR} - GUI_LDFLAGS="-L${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/salome -L${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/paraview" + GUI_LDFLAGS=-L${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/salome GUI_CXXFLAGS=-I${SALOME_GUI_DIR}/include/salome AC_CHECKING(for full GUI) diff --git a/tools/vtkEDFOverloads/Makefile.am b/tools/vtkEDFOverloads/Makefile.am index 5f363b5f4..bd6f5ec5c 100755 --- a/tools/vtkEDFOverloads/Makefile.am +++ b/tools/vtkEDFOverloads/Makefile.am @@ -23,13 +23,16 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am libparaview_LTLIBRARIES = libvtkEDFOverloads.la +lib_LTLIBRARIES = libvtkTools.la salomeinclude_HEADERS = vtkEDFCutter.h \ vtkEDFFactory.h -dist_libvtkEDFOverloads_la_SOURCES = vtkEDFCutter.cxx \ - vtkEDFFactory.cxx +dist_libvtkEDFOverloads_la_SOURCES = vtkEDFFactory.cxx +dist_libvtkTools_la_SOURCES = vtkEDFCutter.cxx libvtkEDFOverloads_la_CPPFLAGS = $(VTK_INCLUDES) +libvtkTools_la_CPPFLAGS = $(VTK_INCLUDES) libvtkEDFOverloads_la_LDFLAGS = $(VTK_LIBS) +libvtkTools_la_LDFLAGS = $(VTK_LIBS) \ No newline at end of file -- 2.39.2