NPAL19051: Dependencies from Plot2d and OCCViewer are added

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
index cf5e4c9985e6b7b98b390a7de97c2e7fe0c0182c..c402411892c37c125822cbc174c68b87751bbdbc 100644 (file)
--- 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 50ee57d5c1931e667beec27941f83e02d009c760..24604a9aec66bfe3725aff7179fbd98d039f7a61 100644 (file)
--- 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