From b9c53f95988986579a38e925d6062beb88e829ce Mon Sep 17 00:00:00 2001 From: sln Date: Tue, 20 May 2008 09:08:00 +0000 Subject: [PATCH] NPAL19051: Dependencies from Plot2d and OCCViewer are added --- src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am | 4 +++- src/SALOME_PYQT/SalomePyQt/Makefile.am | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am index cf5e4c998..c40241189 100644 --- a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am +++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am @@ -62,10 +62,12 @@ libSalomePyQtGUI_la_CPPFLAGS= $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ -D__CALL_OLD_METHODS__ \ -I$(srcdir)/../../PyInterp -I$(srcdir)/../../SalomeApp \ -I$(srcdir)/../../SUIT -I$(srcdir)/../../Qtx -I$(srcdir)/../../LightApp \ + -I$(srcdir)/../../Plot2d -I$(srcdir)/../../OCCViewer \ -I$(srcdir)/../../SalomeApp -I$(srcdir)/../../CAM -I$(srcdir)/../../STD \ -I$(top_builddir)/salome_adm/unix @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ libSalomePyQtGUI_la_LIBADD= $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) \ - $(OGL_LIBS) ../../PyInterp/libPyInterp.la ../../SalomeApp/libSalomeApp.la + $(OGL_LIBS) ../../PyInterp/libPyInterp.la ../../SalomeApp/libSalomeApp.la \ + ../../OCCViewer/libOCCViewer.la ../../Plot2d/libPlot2d.la ################################## diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.am b/src/SALOME_PYQT/SalomePyQt/Makefile.am index 50ee57d5c..24604a9ae 100644 --- a/src/SALOME_PYQT/SalomePyQt/Makefile.am +++ b/src/SALOME_PYQT/SalomePyQt/Makefile.am @@ -72,6 +72,7 @@ COMMON_CPP_FLAGS=$(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) \ -I$(srcdir)/../../Qtx -I$(srcdir)/../../SalomeApp -I$(srcdir)/../../Event \ -I$(srcdir)/../../SalomeSession -I$(srcdir)/../../LogWindow \ -I$(srcdir)/../../VTKViewer -I$(srcdir)/../../TOOLSGUI \ + -I$(srcdir)/../../OCCViewer -I$(srcdir)/../../Plot2d \ -I$(srcdir)/../SALOME_PYQT_GUI -I$(srcdir)/../../PyInterp \ -I$(srcdir)/../../LightApp -I$(srcdir)/../../ObjBrowser \ -I$(srcdir)/../../OBJECT \ @@ -82,7 +83,8 @@ COMMON_LIBS=$(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) \ ../../Qtx/libqtx.la ../../SalomeApp/libSalomeApp.la ../../Event/libEvent.la \ ../../Session/libSalomeSession.la ../../LogWindow/libLogWindow.la \ ../../VTKViewer/libVTKViewer.la ../../TOOLSGUI/libToolsGUI.la \ - ../SALOME_PYQT_GUI/libSalomePyQtGUI.la + ../SALOME_PYQT_GUI/libSalomePyQtGUI.la ../../OCCViewer/libOCCViewer.la \ + ../../Plot2d/libPlot2d.la if IS_SIP_V4 -- 2.39.2