From: apo <apo@opencascade.com>
Date: Thu, 10 Apr 2008 09:09:59 +0000 (+0000)
Subject: Porting to the SUSE Linux distribution
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e9846db8e130837d355479e7434d40c3e9880a34;p=modules%2Fgui.git

Porting to the SUSE Linux distribution
---

diff --git a/src/CAF/CAF.pro b/src/CAF/CAF.pro
index ab8c9c869..56f51b200 100644
--- a/src/CAF/CAF.pro
+++ b/src/CAF/CAF.pro
@@ -4,12 +4,11 @@ DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
-CASROOT = $$(CASROOT)
-CAS_CPPFLAGS = $${CASROOT}/inc
+CAS_CPPFLAGS = $(CASINC)
 
-CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
+CAS_KERNEL = -L$(CASLIB) -lTKernel
 
-CAS_VIEWER = -L$${CASROOT}/Linux/lib -lTKV3d -lTKService
+CAS_VIEWER = -L$(CASLIB) -lTKV3d -lTKService
 
 INCLUDEPATH += ../../include $${CAS_CPPFLAGS}
 LIBS += -L../../$(CONFIG_ID)/lib $${CAS_KERNEL} $${CAS_VIEWER} -lQtx -lSUIT -lSTD
@@ -35,8 +34,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
diff --git a/src/HTMLService/HTMLService.pro b/src/HTMLService/HTMLService.pro
index a9ddcc77a..303e6ab1f 100755
--- a/src/HTMLService/HTMLService.pro
+++ b/src/HTMLService/HTMLService.pro
@@ -4,12 +4,11 @@ DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
-CASROOT = $$(CASROOT)
-CAS_CPPFLAGS = $${CASROOT}/inc
+CAS_CPPFLAGS = $(CASINC)
 
-CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
+CAS_KERNEL = -L$(CASLIB) -lTKernel
 
-CAS_VIEWER = -L$${CASROOT}/Linux/lib -lTKV3d -lTKService
+CAS_VIEWER = -L$(CASLIB) -lTKV3d -lTKService
 
 INCLUDEPATH += ../../include  $${CAS_CPPFLAGS}
 LIBS += -L../../$(CONFIG_ID)/lib $${CAS_KERNEL} $${CAS_VIEWER}
diff --git a/src/LogWindow/LogWindow.pro b/src/LogWindow/LogWindow.pro
index b5c0c72e2..aafb19a4f 100644
--- a/src/LogWindow/LogWindow.pro
+++ b/src/LogWindow/LogWindow.pro
@@ -24,8 +24,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
diff --git a/src/OBJECT/OBJECT.pro b/src/OBJECT/OBJECT.pro
index 0b01883af..5718d74d5 100644
--- a/src/OBJECT/OBJECT.pro
+++ b/src/OBJECT/OBJECT.pro
@@ -4,10 +4,9 @@ DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
-CASROOT = $$(CASROOT)
-CAS_CPPFLAGS = $${CASROOT}/inc
+CAS_CPPFLAGS = $(CASINC)
 
-CAS_LDPATH = -L$${CASROOT}/Linux/lib -lTKV3d
+CAS_LDPATH = -L$(CASLIB) -lTKV3d
 
 INCLUDEPATH += ../../include $${CAS_CPPFLAGS}
 LIBS += $${CAS_LDPATH}
diff --git a/src/ObjBrowser/ObjBrowser.pro b/src/ObjBrowser/ObjBrowser.pro
index 7b95f3b9d..61bf93c5b 100644
--- a/src/ObjBrowser/ObjBrowser.pro
+++ b/src/ObjBrowser/ObjBrowser.pro
@@ -23,8 +23,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
diff --git a/src/Plot2d/Plot2d.pro b/src/Plot2d/Plot2d.pro
index dbaa3f700..9a06a130f 100644
--- a/src/Plot2d/Plot2d.pro
+++ b/src/Plot2d/Plot2d.pro
@@ -4,13 +4,9 @@ DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
-QWTHOME=$$(QWTHOME)
-QWTINC=$${QWTHOME}/includes
-QWTLIB=$${QWTHOME}/lib
-
-INCLUDEPATH += ../../include $${QWTINC} $$(PYTHONINC)
+INCLUDEPATH += ../../include $$(QWTINC) $$(PYTHONINC)
 INCLUDEPATH += ../Qtx ../SUIT
-unix:LIBS  += -L$${QWTLIB} -lqwt
+unix:LIBS  += -L$$(QWTLIB) -lqwt
 win32:LIBS += /LIBPATH:$$(QWTLIB)
 LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT
 
@@ -31,8 +27,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
diff --git a/src/PyConsole/PyConsole.pro b/src/PyConsole/PyConsole.pro
index 01a4f69c6..a4fd5061b 100644
--- a/src/PyConsole/PyConsole.pro
+++ b/src/PyConsole/PyConsole.pro
@@ -24,8 +24,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
diff --git a/src/STD/STD.pro b/src/STD/STD.pro
index 81e5dcbd4..5d283c758 100644
--- a/src/STD/STD.pro
+++ b/src/STD/STD.pro
@@ -24,8 +24,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
diff --git a/src/SUIT/SUIT.pro b/src/SUIT/SUIT.pro
index a70f8567c..63f66e07a 100644
--- a/src/SUIT/SUIT.pro
+++ b/src/SUIT/SUIT.pro
@@ -24,8 +24,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
diff --git a/src/SVTK/SVTK.pro b/src/SVTK/SVTK.pro
index c968583a8..9bf2a02f7 100644
--- a/src/SVTK/SVTK.pro
+++ b/src/SVTK/SVTK.pro
@@ -6,8 +6,7 @@ OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 VTK_LIBS = -L$$(VTKLIB) -lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets   -lGL -L/usr/X11R6/lib -lGLU -L/usr/X11R6/lib -lX11 -lXt
 
-CASROOT = $$(CASROOT)
-CAS_CPPFLAGS = $${CASROOT}/inc
+CAS_CPPFLAGS = $(CASINC)
 
 OCC_LIBS = 
 
@@ -95,8 +94,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
diff --git a/src/TableViewer/TableViewer.pro b/src/TableViewer/TableViewer.pro
index d35ddaf34..b7a51d410 100644
--- a/src/TableViewer/TableViewer.pro
+++ b/src/TableViewer/TableViewer.pro
@@ -4,9 +4,8 @@ DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
 OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
-CASROOT = $$(CASROOT)
-CAS_CPPFLAGS = $${CASROOT}/inc
-CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
+CAS_CPPFLAGS = $(CASINC)
+CAS_KERNEL = -L$(CASLIB) -lTKernel
 
 INCLUDEPATH = ../../include  $${CAS_CPPFLAGS}
 LIBS += -L../../$(CONFIG_ID)/lib -lSUIT $${CAS_KERNEL} -lHTMLService
@@ -32,8 +31,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS
diff --git a/src/TableViewer/TableViewer_ViewWindow.cxx b/src/TableViewer/TableViewer_ViewWindow.cxx
index cb72a5f68..e31167244 100755
--- a/src/TableViewer/TableViewer_ViewWindow.cxx
+++ b/src/TableViewer/TableViewer_ViewWindow.cxx
@@ -359,7 +359,7 @@ void TableViewer_ViewWindow::exportData()
   exportData( fileName );
 }
 
-Handle(HTMLService_HTMLTable) TableViewer_ViewWindow::exportTableData()
+Handle(HTMLService_HTMLTable) TableViewer_ViewWindow::exportToHTML()
 {
   int rows = numRows( Cells );
   int cols = numCols( Cells );
@@ -394,7 +394,7 @@ void TableViewer_ViewWindow::exportData( const QString& theFileName )
 {
   QApplication::setOverrideCursor( Qt::WaitCursor );
 
-  exportTableData()->GenerateFile( TableViewer_Tool::ToExtString( theFileName ), true );
+  exportToHTML()->GenerateFile( TableViewer_Tool::ToExtString( theFileName ), true );
 
   QApplication::restoreOverrideCursor();
 }
@@ -540,3 +540,4 @@ QtxTable* TableViewer_ViewWindow::createTable()
            this, SLOT( selectionChanged() ) );
   return aTable;
 }
+
diff --git a/src/TableViewer/TableViewer_ViewWindow.h b/src/TableViewer/TableViewer_ViewWindow.h
index 7fdea5fcd..ee7879056 100755
--- a/src/TableViewer/TableViewer_ViewWindow.h
+++ b/src/TableViewer/TableViewer_ViewWindow.h
@@ -52,7 +52,7 @@ public:
 
   void                exportData();
   void                exportData( const QString& );
-  Handle(HTMLService_HTMLTable) exportTableData();
+  Handle(HTMLService_HTMLTable) exportToHTML();
 
   void                copyData();
   void                pasteData();
@@ -110,4 +110,3 @@ private:
 };
 
 #endif // !defined(TABLEVIEWER_VIEWWINDOW_H)
-
diff --git a/src/VTKViewer/VTKViewer.pro b/src/VTKViewer/VTKViewer.pro
index 4ee1e29b6..96bf750ee 100644
--- a/src/VTKViewer/VTKViewer.pro
+++ b/src/VTKViewer/VTKViewer.pro
@@ -6,10 +6,9 @@ OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 VTK_LIBS = -L$$(VTKLIB) -lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkParallel -lvtkWidgets   -lGL -L/usr/X11R6/lib -lGLU -L/usr/X11R6/lib -lX11 -lXt
 
-CASROOT = $$(CASROOT)
-CAS_CPPFLAGS = $${CASROOT}/inc
+CAS_CPPFLAGS = $(CASINC)
 
-CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
+CAS_KERNEL = -L$(CASLIB) -lTKernel
 
 INCLUDEPATH += ../../include $$(VTKINC) $${CAS_CPPFLAGS} ../Qtx ../SUIT
 LIBS += -L../../$(CONFIG_ID)/lib -lQtx -lSUIT $${VTK_LIBS} $${CAS_KERNEL}
@@ -74,8 +73,8 @@ unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources
 
 lrelease.name = LRELASE ${QMAKE_FILE_IN}
-unix:lrelease.commands = $(QTDIR)/$(CONFIG_ID)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
-win32:lrelease.commands = $(QTDIR)\\$(CONFIG_ID)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
+unix:lrelease.commands = $(QTDIR)/bin/lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}/${QMAKE_FILE_BASE}.qm
+win32:lrelease.commands = $(QTDIR)\\bin\\lrelease ${QMAKE_FILE_NAME} -qm $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 unix:lrelease.output = $${GUIResources}/${QMAKE_FILE_BASE}.qm
 win32:lrelease.output = $${GUIResources}\\${QMAKE_FILE_BASE}.qm
 lrelease.input = TRANSLATIONS