From 1accfb704788855c4881cf421c51c96111ee228a Mon Sep 17 00:00:00 2001 From: mpv Date: Thu, 15 Feb 2007 10:56:00 +0000 Subject: [PATCH] MPV: merge from branch BR_GUI_AutoTools --- src/SVTK/Makefile.am | 9 ++- src/SVTK/Makefile.in | 130 ------------------------------------------- 2 files changed, 6 insertions(+), 133 deletions(-) delete mode 100755 src/SVTK/Makefile.in diff --git a/src/SVTK/Makefile.am b/src/SVTK/Makefile.am index 7f96a1f77..a354a67ba 100755 --- a/src/SVTK/Makefile.am +++ b/src/SVTK/Makefile.am @@ -50,7 +50,8 @@ salomeinclude_HEADERS= \ SVTK_SelectionEvent.h \ SVTK_SpaceMouse.h \ SVTK_Event.h \ - SVTK_ViewModelBase.h + SVTK_ViewModelBase.h \ + SVTK_SetRotationPointDlg.h dist_libSVTK_la_SOURCES= \ SVTK_Prs.cxx \ @@ -75,7 +76,8 @@ dist_libSVTK_la_SOURCES= \ SVTK_RenderWindowInteractor.cxx \ SVTK_GenericRenderWindowInteractor.cxx \ SVTK_SpaceMouse.cxx \ - SVTK_Selector.cxx + SVTK_Selector.cxx \ + SVTK_SetRotationPointDlg.cxx EXTRA_DIST+= SVTK_SelectorDef.h SVTK_Trihedron.h @@ -92,7 +94,8 @@ MOC_FILES= \ SVTK_ViewWindow_moc.cxx \ SVTK_MainWindow_moc.cxx \ SVTK_ViewModel_moc.cxx \ - SVTK_View_moc.cxx + SVTK_View_moc.cxx \ + SVTK_SetRotationPointDlg_moc.cxx nodist_libSVTK_la_SOURCES= $(MOC_FILES) nodist_salomeres_DATA= \ diff --git a/src/SVTK/Makefile.in b/src/SVTK/Makefile.in deleted file mode 100755 index d2e6c224d..000000000 --- a/src/SVTK/Makefile.in +++ /dev/null @@ -1,130 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : Alexander Solovyov(OCN) -# Module : SVTK -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@srcdir@/resources - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= \ - SVTK.h \ - SVTK_Prs.h \ - SVTK_Actor.h \ - SALOME_Actor.h \ - SVTK_RectPicker.h \ - SVTK_DeviceActor.h \ - SVTK_DialogBase.h \ - SVTK_FontWidget.h \ - SVTK_CubeAxesActor2D.h \ - SVTK_Functor.h \ - SVTK_MainWindow.h \ - SVTK_View.h \ - SVTK_ViewManager.h \ - SVTK_ViewModel.h \ - SVTK_ViewWindow.h \ - SVTK_Renderer.h \ - SVTK_InteractorStyle.h \ - SVTK_RenderWindowInteractor.h \ - SVTK_GenericRenderWindowInteractor.h \ - SVTK_Selector.h \ - SVTK_Selection.h \ - SVTK_SelectionEvent.h \ - SVTK_SpaceMouse.h \ - SVTK_Event.h \ - SVTK_ViewModelBase.h \ - SVTK_Extension.h - -PO_FILES = \ - SVTK_msg_en.po \ - SVTK_images.po - -# Libraries targets -LIB = libSVTK.la - -LIB_SRC= \ - SVTK_Prs.cxx \ - SVTK_Actor.cxx \ - SALOME_Actor.cxx \ - SVTK_RectPicker.cxx \ - SVTK_DeviceActor.cxx \ - SVTK_CubeAxesActor2D.cxx \ - SVTK_NonIsometricDlg.cxx \ - SVTK_UpdateRateDlg.cxx \ - SVTK_CubeAxesDlg.cxx \ - SVTK_SetRotationPointDlg.cxx \ - SVTK_DialogBase.cxx \ - SVTK_FontWidget.cxx \ - SVTK_Trihedron.cxx \ - SVTK_MainWindow.cxx \ - SVTK_View.cxx \ - SVTK_ViewManager.cxx \ - SVTK_ViewModel.cxx \ - SVTK_Renderer.cxx \ - SVTK_ViewWindow.cxx \ - SVTK_InteractorStyle.cxx \ - SVTK_RenderWindowInteractor.cxx \ - SVTK_GenericRenderWindowInteractor.cxx \ - SVTK_SpaceMouse.cxx \ - SVTK_Selector.cxx \ - SVTK_Extension.cxx - -LIB_MOC = \ - SVTK_GenericRenderWindowInteractor.h \ - SVTK_RenderWindowInteractor.h \ - SVTK_NonIsometricDlg.h \ - SVTK_UpdateRateDlg.h \ - SVTK_CubeAxesDlg.h \ - SVTK_SetRotationPointDlg.h \ - SVTK_FontWidget.h \ - SVTK_DialogBase.h \ - SVTK_ViewModelBase.h \ - SVTK_ViewManager.h \ - SVTK_ViewWindow.h \ - SVTK_MainWindow.h \ - SVTK_ViewModel.h \ - SVTK_View.h - -BIN = SVTK - -CPPFLAGS+= \ - $(QT_INCLUDES) \ - $(OCC_INCLUDES) \ - $(VTK_INCLUDES) \ - $(QWT_INCLUDES) \ - $(BOOST_CPPFLAGS) - -LDFLAGS+= \ - $(QT_MT_LIBS) \ - $(OCC_LIBS) \ - $(QWT_LIBS) \ - $(VTK_LIBS) - -LIBS+= -lqtx -lsuit -lstd -lCAM -lSalomeObject -lSalomePrs -lVTKViewer - -LDFLAGSFORBIN=$(LDFLAGS) $(LIBS) - -@CONCLUDE@ -- 2.39.2