From 34e06077fdffc8b480215bb79ecfe2ba7ea72b88 Mon Sep 17 00:00:00 2001 From: mpv Date: Wed, 20 Apr 2005 05:29:31 +0000 Subject: [PATCH] MPV: GenericObj is necessary for SALOMEDS --- src/Loader/Makefile.in | 4 +++- 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 | 2 +- src/SALOME_SWIG/Makefile.in | 3 ++- src/SUPERVGraph/Makefile.in | 3 ++- src/Session/Makefile.in | 2 +- src/TOOLSDS/Makefile.in | 2 +- src/TOOLSGUI/Makefile.in | 2 +- src/VTKViewer/Makefile.in | 3 ++- 12 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/Loader/Makefile.in b/src/Loader/Makefile.in index 7660e9882..c454646da 100644 --- a/src/Loader/Makefile.in +++ b/src/Loader/Makefile.in @@ -27,7 +27,9 @@ BIN_CLIENT_IDL = SALOME_Session.idl \ SALOME_Component.idl \ SALOME_ModuleCatalog.idl \ SALOME_Registry.idl \ - SALOME_Exception.idl Logger.idl + SALOME_Exception.idl \ + Logger.idl \ + SALOME_GenericObj.idl CPPFLAGS+=$(QT_MT_INCLUDES) CXXFLAGS+=$(OCC_CXXFLAGS) diff --git a/src/OCCViewer/Makefile.in b/src/OCCViewer/Makefile.in index 669b4f8ca..61051ed93 100644 --- a/src/OCCViewer/Makefile.in +++ b/src/OCCViewer/Makefile.in @@ -40,7 +40,8 @@ LIB_CLIENT_IDL = SALOMEDS.idl \ SALOME_ModuleCatalog.idl \ SALOME_Component.idl \ SALOME_ContainerManager.idl \ - SALOME_Exception.idl + SALOME_Exception.idl \ + SALOME_GenericObj.idl CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(OGL_INCLUDES) $(PYTHON_INCLUDES) diff --git a/src/Plot2d/Makefile.in b/src/Plot2d/Makefile.in index ca9f91bf1..694cba312 100644 --- a/src/Plot2d/Makefile.in +++ b/src/Plot2d/Makefile.in @@ -44,7 +44,8 @@ LIB_CLIENT_IDL = SALOMEDS.idl \ SALOME_ModuleCatalog.idl \ SALOME_Component.idl \ SALOME_ContainerManager.idl \ - SALOME_Exception.idl + SALOME_Exception.idl \ + SALOME_GenericObj.idl CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(OGL_INCLUDES) $(PYTHON_INCLUDES) $(QWT_INCLUDES) LDFLAGS+=$(QT_MT_LIBS) $(OGL_LIBS) $(QWT_LIBS) -lSalomePrs -lSalomeGUI diff --git a/src/SALOMEGUI/Makefile.in b/src/SALOMEGUI/Makefile.in index e8ba535f7..a20951f70 100644 --- a/src/SALOMEGUI/Makefile.in +++ b/src/SALOMEGUI/Makefile.in @@ -222,7 +222,8 @@ LIB_CLIENT_IDL = SALOMEDS.idl \ SALOME_ModuleCatalog.idl \ SALOME_Component.idl \ SALOME_ContainerManager.idl \ - SALOME_Exception.idl + SALOME_Exception.idl \ + SALOME_GenericObj.idl CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) LDFLAGS+=$(QT_MT_LIBS) -lSalomeNS -lqsplitterP -lSalomeLifeCycleCORBA -lOpUtil -lSalomeObject -lEvent -lSalomePrs diff --git a/src/SALOME_PY/Makefile.in b/src/SALOME_PY/Makefile.in index 9b8cf7e33..7215e366f 100644 --- a/src/SALOME_PY/Makefile.in +++ b/src/SALOME_PY/Makefile.in @@ -42,7 +42,8 @@ LIB_SRC = SalomePy.cxx LIB_CLIENT_IDL = SALOMEDS.idl \ SALOMEDS_Attributes.idl \ SALOME_ContainerManager.idl \ - SALOME_Exception.idl + SALOME_Exception.idl \ + SALOME_GenericObj.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 a72114d91..ebe7db180 100644 --- a/src/SALOME_PYQT/Makefile.in +++ b/src/SALOME_PYQT/Makefile.in @@ -53,7 +53,7 @@ LIB_MOC = SALOME_PYQT_GUI.h EXPORT_SHAREDPYSCRIPTS = SalomePyQt.py -LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_ContainerManager.idl +LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_ContainerManager.idl SALOME_GenericObj.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/SALOME_SWIG/Makefile.in b/src/SALOME_SWIG/Makefile.in index a5dd3b7c9..1b9246894 100644 --- a/src/SALOME_SWIG/Makefile.in +++ b/src/SALOME_SWIG/Makefile.in @@ -45,7 +45,8 @@ EXPORT_PYSCRIPTS = libSALOME_Swig.py batchmode_salome.py #EXPORT_SHAREDPYSCRIPTS=kernel_shared_modules.py LIB_CLIENT_IDL = SALOMEDS.idl \ - SALOME_Exception.idl + SALOME_Exception.idl \ + SALOME_GenericObj.idl CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) -DHAVE_CONFIG_H LIBS+= $(PYTHON_LIBS) diff --git a/src/SUPERVGraph/Makefile.in b/src/SUPERVGraph/Makefile.in index b108204d7..5dc1a648d 100644 --- a/src/SUPERVGraph/Makefile.in +++ b/src/SUPERVGraph/Makefile.in @@ -23,7 +23,8 @@ LIB_CLIENT_IDL = SALOMEDS.idl \ SALOME_ModuleCatalog.idl \ SALOME_Component.idl \ SALOME_ContainerManager.idl \ - SALOME_Exception.idl + SALOME_Exception.idl \ + SALOME_GenericObj.idl CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in index 499b7705f..3b06830f4 100644 --- a/src/Session/Makefile.in +++ b/src/Session/Makefile.in @@ -49,7 +49,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_ContainerManager.idl SALOME_Registry.idl SALOME_ModuleCatalog.idl SALOME_Exception.idl +BIN_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOME_ContainerManager.idl SALOME_Registry.idl SALOME_ModuleCatalog.idl SALOME_Exception.idl SALOME_GenericObj.idl CPPFLAGS+=$(QT_MT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(HDF5_INCLUDES) CXXFLAGS+=$(OCC_CXXFLAGS) diff --git a/src/TOOLSDS/Makefile.in b/src/TOOLSDS/Makefile.in index a3d0a4fdc..688895a9e 100644 --- a/src/TOOLSDS/Makefile.in +++ b/src/TOOLSDS/Makefile.in @@ -23,7 +23,7 @@ LIB_SRC = \ # Executables targets BIN = BIN_SRC = -LIB_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Exception.idl +LIB_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Exception.idl SALOME_GenericObj.idl BIN_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl BIN_CLIENT_IDL = diff --git a/src/TOOLSGUI/Makefile.in b/src/TOOLSGUI/Makefile.in index d41cb3724..c5a9d8829 100644 --- a/src/TOOLSGUI/Makefile.in +++ b/src/TOOLSGUI/Makefile.in @@ -50,7 +50,7 @@ LIB_SRC = ToolsGUI.cxx \ LIB_MOC = ToolsGUI_CatalogGeneratorDlg_moc.cxx -LIB_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl \ +LIB_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_GenericObj.idl \ SALOME_Component.idl SALOME_ContainerManager.idl SALOME_Exception.idl # additionnal information to compil and link file diff --git a/src/VTKViewer/Makefile.in b/src/VTKViewer/Makefile.in index f5e06c1ed..0af8cf924 100644 --- a/src/VTKViewer/Makefile.in +++ b/src/VTKViewer/Makefile.in @@ -70,7 +70,8 @@ LIB_CLIENT_IDL = SALOMEDS.idl \ SALOME_ModuleCatalog.idl \ SALOME_Component.idl \ SALOME_ContainerManager.idl \ - SALOME_Exception.idl + SALOME_Exception.idl \ + SALOME_GenericObj.idl CPPFLAGS+=$(QT_INCLUDES) $(OGL_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) -- 2.39.2