From f057d6a26ebe369375020ecb8399e0d15b171ea4 Mon Sep 17 00:00:00 2001 From: rahuel Date: Tue, 9 Nov 2004 07:44:34 +0000 Subject: [PATCH] Restore without ContainersManager & ContainersManager --- src/OCCViewer/Makefile.in | 3 +-- src/Plot2d/Makefile.in | 3 +-- src/SALOMEGUI/Makefile.in | 3 +-- src/SALOME_PY/Makefile.in | 3 +-- src/SALOME_PYQT/Makefile.in | 3 +-- src/SUPERVGraph/Makefile.in | 3 +-- src/Session/Makefile.in | 2 +- src/TOOLSGUI/Makefile.in | 3 +-- src/VTKViewer/Makefile.in | 3 +-- 9 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/OCCViewer/Makefile.in b/src/OCCViewer/Makefile.in index fcd5aec1f..beb42bbf0 100644 --- a/src/OCCViewer/Makefile.in +++ b/src/OCCViewer/Makefile.in @@ -40,8 +40,7 @@ LIB_MOC = \ LIB_CLIENT_IDL = SALOMEDS.idl \ SALOME_ModuleCatalog.idl \ SALOME_Component.idl \ - SALOME_Exception.idl \ - ContainersManager.idl + SALOME_Exception.idl CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(OGL_INCLUDES) $(PYTHON_INCLUDES) diff --git a/src/Plot2d/Makefile.in b/src/Plot2d/Makefile.in index fa9a998e3..580beb445 100644 --- a/src/Plot2d/Makefile.in +++ b/src/Plot2d/Makefile.in @@ -41,8 +41,7 @@ LIB_MOC = \ LIB_CLIENT_IDL = SALOMEDS.idl \ SALOME_ModuleCatalog.idl \ SALOME_Component.idl \ - SALOME_Exception.idl \ - ContainersManager.idl + SALOME_Exception.idl CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(OGL_INCLUDES) $(PYTHON_INCLUDES) $(QWT_INCLUDES) LDFLAGS+=$(QT_MT_LIBS) $(OGL_LIBS) $(QWT_LIBS) -lSalomeGUI diff --git a/src/SALOMEGUI/Makefile.in b/src/SALOMEGUI/Makefile.in index 2a4736bb4..08d0682d3 100644 --- a/src/SALOMEGUI/Makefile.in +++ b/src/SALOMEGUI/Makefile.in @@ -215,8 +215,7 @@ LIB_CLIENT_IDL = SALOMEDS.idl \ SALOMEDS_Attributes.idl \ SALOME_ModuleCatalog.idl \ SALOME_Component.idl \ - SALOME_Exception.idl \ - ContainersManager.idl + SALOME_Exception.idl CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) LDFLAGS+=$(QT_MT_LIBS) -lSalomeNS -lqsplitterP -lSalomeLifeCycleCORBA -lOpUtil -lSalomeObject diff --git a/src/SALOME_PY/Makefile.in b/src/SALOME_PY/Makefile.in index c2200d042..419d466dc 100644 --- a/src/SALOME_PY/Makefile.in +++ b/src/SALOME_PY/Makefile.in @@ -41,8 +41,7 @@ LIB_SRC = SalomePy.cxx LIB_CLIENT_IDL = SALOMEDS.idl \ SALOMEDS_Attributes.idl \ - SALOME_Exception.idl \ - ContainersManager.idl + SALOME_Exception.idl CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) -DHAVE_CONFIG_H LDFLAGS+= $(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -lSalomeGUI -lvtkCommonPython -lvtkGraphicsPython -lvtkImagingPython -lVTKViewer diff --git a/src/SALOME_PYQT/Makefile.in b/src/SALOME_PYQT/Makefile.in index d7611ea3d..86105f7fa 100644 --- a/src/SALOME_PYQT/Makefile.in +++ b/src/SALOME_PYQT/Makefile.in @@ -46,8 +46,7 @@ LIB_SRC += SalomePyQt.cxx SALOME_PYQT_GUI.cxx $(SIP_SRC) $(MOC_SRC) EXPORT_SHAREDPYSCRIPTS = SalomePyQt.py -LIB_CLIENT_IDL = SALOME_Exception.idl \ - ContainersManager.idl +LIB_CLIENT_IDL = SALOME_Exception.idl CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(SIP_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) LIBS+= $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) $(OGL_LIBS) diff --git a/src/SUPERVGraph/Makefile.in b/src/SUPERVGraph/Makefile.in index e658192cb..908415910 100644 --- a/src/SUPERVGraph/Makefile.in +++ b/src/SUPERVGraph/Makefile.in @@ -22,8 +22,7 @@ LIB_MOC = SUPERVGraph_moc.cxx \ LIB_CLIENT_IDL = SALOMEDS.idl \ SALOME_ModuleCatalog.idl \ SALOME_Component.idl \ - SALOME_Exception.idl \ - ContainersManager.idl + SALOME_Exception.idl CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in index a9f12811c..64dcfb81d 100644 --- a/src/Session/Makefile.in +++ b/src/Session/Makefile.in @@ -47,7 +47,7 @@ LIB_SRC=\ BIN = SALOME_Session_Server BIN_SRC = BIN_SERVER_IDL = SALOME_Session.idl -BIN_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOME_Registry.idl SALOME_ModuleCatalog.idl SALOME_Exception.idl ContainersManager.idl +BIN_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOME_Registry.idl SALOME_ModuleCatalog.idl SALOME_Exception.idl CPPFLAGS+=$(QT_MT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) CXXFLAGS+=$(OCC_CXXFLAGS) diff --git a/src/TOOLSGUI/Makefile.in b/src/TOOLSGUI/Makefile.in index ffb9acf20..597dddda2 100644 --- a/src/TOOLSGUI/Makefile.in +++ b/src/TOOLSGUI/Makefile.in @@ -51,8 +51,7 @@ LIB_SRC = ToolsGUI.cxx \ LIB_MOC = ToolsGUI_moc.cxx \ ToolsGUI_CatalogGeneratorDlg_moc.cxx -LIB_CLIENT_IDL = SALOME_Exception.idl \ - ContainersManager.idl +LIB_CLIENT_IDL = SALOME_Exception.idl # additionnal information to compil and link file diff --git a/src/VTKViewer/Makefile.in b/src/VTKViewer/Makefile.in index 4a848a672..f7b216bce 100644 --- a/src/VTKViewer/Makefile.in +++ b/src/VTKViewer/Makefile.in @@ -60,8 +60,7 @@ LIB_MOC = \ LIB_CLIENT_IDL = SALOMEDS.idl \ SALOME_ModuleCatalog.idl \ SALOME_Component.idl \ - SALOME_Exception.idl \ - ContainersManager.idl + SALOME_Exception.idl CPPFLAGS+=$(QT_INCLUDES) $(OGL_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) CXXFLAGS+= -- 2.39.2