SMH: Fixes and patches from Paul.

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index d35453520273af78307e0890c49db2ccf2c97a32..79a5d5efbda7f07d8a4ee3dcae8f181c9cd7ee87 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -10,9 +10,12 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
 
 
 LIBS=@LIBS@ 
+LIBSFORBIN=@LIBS@
 LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome
+LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome
 # add libstdc++ to link c++ library with libtool !
 LDFLAGS+= -lstdc++
+LDFLAGSFORBIN+= -lstdc++
 
 CP=@CP@
 

diff --git a/src/CAF/CAF_Tools.h b/src/CAF/CAF_Tools.h
index a1a5ac4b85dd951ab77799d97f2fa2a2bb3f0ee0..78f058f2503a848747bd0f9d2c12a94cbf7cb4e5 100755 (executable)
--- a/src/CAF/CAF_Tools.h
+++ b/src/CAF/CAF_Tools.h
@@ -6,7 +6,7 @@
 
 #include <CAF.h>
 
-#include <qt.h>
+#include <qnamespace.h>
 #include <qstring.h>
 #include <TCollection_ExtendedString.hxx>
 

diff --git a/src/CAF/Makefile.in b/src/CAF/Makefile.in
index dd19a5d7faeaa728ce1d4681a503405314907b69..b4789adf7a5d5ac11961c90328181538ba4c3a10 100755 (executable)
--- a/src/CAF/Makefile.in
+++ b/src/CAF/Makefile.in
@@ -43,8 +43,7 @@ undo.png
 CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) -I${QTDIR}/src/kernel -I$(QTDIR)/mkspecs/linux-g++
 
 LDFLAGS+=$(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_OCAF)
-LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lstd
-LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit
+LIBS+= -lstd -lsuit
 
 @CONCLUDE@
 

diff --git a/src/CAM/Makefile.in b/src/CAM/Makefile.in
index c031fa261b2171d353288f203f34e6e81e57dbc1..4473bc99fca8667b73ddd83c52081d71d2dac895 100755 (executable)
--- a/src/CAM/Makefile.in
+++ b/src/CAM/Makefile.in
@@ -39,7 +39,8 @@ CPPFLAGS+=$(QT_INCLUDES)
 
 LDFLAGS+=$(QT_MT_LIBS)
 
-LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit -lstd
+LIBS+= -lsuit -lstd
+LDFLAGSFORBIN= -lSUITApp
 
 @CONCLUDE@
 

diff --git a/src/GLViewer/Makefile.in b/src/GLViewer/Makefile.in
index 76235190c30741c5349f27bdb9b281268adc8083..7b69fc8032c379dff9d6409c746a557080c392c4 100644 (file)
--- a/src/GLViewer/Makefile.in
+++ b/src/GLViewer/Makefile.in
@@ -80,6 +80,6 @@ CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES)
 
 LDFLAGS+=$(QT_MT_LIBS) $(CAS_KERNEL)
 
-LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit -L/usr/X11R6/lib -lGLU
+LIBS+= -lsuit -L/usr/X11R6/lib -lGLU
 
 @CONCLUDE@

diff --git a/src/Loader/Makefile.in b/src/Loader/Makefile.in
index d047d4c2c78f326a7fb9ca943b323031332b8471..b628b7141885f4d834431c3f7797e57d43448582 100755 (executable)
--- a/src/Loader/Makefile.in
+++ b/src/Loader/Makefile.in
@@ -33,6 +33,7 @@ BIN_CLIENT_IDL = SALOME_Session.idl \
 CPPFLAGS+=$(QT_MT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS+=$(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
 LDFLAGS+=$(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lOpUtil -lSALOMELocalTrace
+LDFLAGSFORBIN= $(LDFLAGS) -lSALOMETraceCollector
 
 
 @CONCLUDE@

diff --git a/src/ObjBrowser/Makefile.in b/src/ObjBrowser/Makefile.in
index cbdaf0e3b5f96d5ae7c76fb2351221d04e76e70f..cdb715d691a636d562799e0a6b5bb79db41e33bd 100755 (executable)
--- a/src/ObjBrowser/Makefile.in
+++ b/src/ObjBrowser/Makefile.in
@@ -35,7 +35,7 @@ PO_FILES = OB_msg_en.po
 CPPFLAGS+=$(QT_INCLUDES)
 
 LDFLAGS+=$(QT_MT_LIBS)
-LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit
+LIBS+= -lsuit
 
 @CONCLUDE@
 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
index 7b510275529941bedc3a77417284833ee993ddc4..a8d05679bf5e789d1a86aad5ce09c9b21f2e4fdc 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
@@ -19,6 +19,10 @@ ifeq ($(QT_VERS),Qt_3_3_3)
 QT_VERS = Qt_3_3_0
 endif
 
+ifeq ($(QT_VERS),Qt_3_3_4)
+QT_VERS = Qt_3_3_0
+endif
+
 # Sip flags
 SIP_FLAGS = -t WS_X11 -t $(QT_VERS) -s ".cc" -c . -I $(PYQT_SIPS)
 

diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.in b/src/SALOME_PYQT/SalomePyQt/Makefile.in
index 300a7b509ad81a6f44e7b449afc03f5a103d0777..6899f984b29b29ebae58c3c4f8584bdbddb70ee4 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/Makefile.in
+++ b/src/SALOME_PYQT/SalomePyQt/Makefile.in
@@ -19,6 +19,9 @@ VPATH=.:@srcdir@:@top_srcdir@/idl
 ifeq ($(QT_VERS),Qt_3_3_3)
 QT_VERS = Qt_3_3_0
 endif
+ifeq ($(QT_VERS),Qt_3_3_4)
+QT_VERS = Qt_3_3_0
+endif
 
 # Sip flags
 SIP_FLAGS = -t WS_X11 -t $(QT_VERS) -s ".cc" -c . -I $(PYQT_SIPS)

diff --git a/src/SOCC/Makefile.in b/src/SOCC/Makefile.in
index d22bb1a0f238ff591d356b707cbe2baad6a92bc1..26f3ef6f3d576dbf6a0dd79a759f1c1c7245f6e2 100755 (executable)
--- a/src/SOCC/Makefile.in
+++ b/src/SOCC/Makefile.in
@@ -32,6 +32,6 @@ LIB_CLIENT_IDL = SALOMEDS.idl \
 CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome
 
 LDFLAGS+=$(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome
-LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit -lSalomeObject -lSalomePrs -lOCCViewer -lOpUtil
+LIBS+= -lsuit -lSalomeObject -lSalomePrs -lOCCViewer -lOpUtil
 
 @CONCLUDE@

diff --git a/src/STD/Makefile.in b/src/STD/Makefile.in
index dc331fe1c8f4e700a5a5f881a8b89c5fe7bc5287..878870e9aee8d53c0810d714f5612b6065e9f824 100755 (executable)
--- a/src/STD/Makefile.in
+++ b/src/STD/Makefile.in
@@ -57,6 +57,6 @@ std.ini
 CPPFLAGS+=$(QT_INCLUDES)
 
 LDFLAGS+=$(QT_MT_LIBS)
-LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit
+LIBS+= -lsuit
 
 @CONCLUDE@

diff --git a/src/SUITApp/Makefile.in b/src/SUITApp/Makefile.in
index 75f67c928545b3192403d411ece3bdb2d329506d..9fb9dc088243f3120aea0f5acf75b1a2ec49fafd 100644 (file)
--- a/src/SUITApp/Makefile.in
+++ b/src/SUITApp/Makefile.in
@@ -34,7 +34,8 @@ CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES)
 LDFLAGS+=$(QT_MT_LIBS) 
 
 LIBS+= -Xlinker -export-dynamic $(PYTHON_LIBS)
-LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit -lqtx
+LIBS+= -lsuit -lqtx
+LIBSFORBIN+= -lsuit -lqtx
 
 @CONCLUDE@
 

diff --git a/src/SUPERVGraph/Makefile.in b/src/SUPERVGraph/Makefile.in
index 433f6239f8c25b85ef9ba9a4d9d2cf878b9a9069..11f7c6500fa65806152b333615df07b876b09001 100755 (executable)
--- a/src/SUPERVGraph/Makefile.in
+++ b/src/SUPERVGraph/Makefile.in
@@ -31,7 +31,7 @@ LIB_CLIENT_IDL = SALOMEDS.idl \
                 SALOME_GenericObj.idl
 
 
-CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
+CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
 LDFLAGS+=$(QT_MT_LIBS) -L$(top_builddir)/lib
 
 

diff --git a/src/SVTK/Makefile.in b/src/SVTK/Makefile.in
index 75bf1e05568dc75c511cbc8d8f1e82cc6e5ddd2c..806e7996428ec3de6b3a149ea922bb75677899b7 100755 (executable)
--- a/src/SVTK/Makefile.in
+++ b/src/SVTK/Makefile.in
@@ -53,6 +53,6 @@ LIB_CLIENT_IDL = SALOMEDS.idl \
 CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome
 
 LDFLAGS+=$(QT_MT_LIBS) $(OCC_LIBS) $(VTK_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome
-LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit -lCAM -lSalomeObject -lSalomePrs -lVTKViewer -lOpUtil
+LIBS+= -lsuit -lCAM -lSalomeObject -lSalomePrs -lVTKViewer -lOpUtil
 
 @CONCLUDE@

diff --git a/src/SalomeApp/Makefile.in b/src/SalomeApp/Makefile.in
index 241d845717e8a0292bcd4f25d801f50a9f584e98..4b7ec7dd3b543fbd8d11bfb929df875a0b94391d 100755 (executable)
--- a/src/SalomeApp/Makefile.in
+++ b/src/SalomeApp/Makefile.in
@@ -102,7 +102,7 @@ RESOURCES_FILES = icon_about.png \
 CPPFLAGS+=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(QWT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
 
 LDFLAGS+=$(PYTHON_LIBS) $(QT_MT_LIBS) 
-LIBS+= -L$(GUI_ROOT_DIR)/lib/salome -lsuit -lstd -lCAM -lObjBrowser -L$(KERNEL_ROOT_DIR)/lib/salome -lOpUtil -lSALOMELocalTrace $(CAS_KERNEL) -lPlot2d -lGLViewer -lOCCViewer -lVTKViewer -lSalomeObject -lSVTK -lSOCC -lSPlot2d -lPyInterp -lPythonConsole -lLogWindow -lSalomeContainer
+LIBS+= -lsuit -lstd -lCAM -lObjBrowser -L$(KERNEL_ROOT_DIR)/lib/salome -lOpUtil -lSALOMELocalTrace $(CAS_KERNEL) -lPlot2d -lGLViewer -lOCCViewer -lVTKViewer -lSalomeObject -lSVTK -lSOCC -lPyInterp -lPythonConsole -lLogWindow -lSalomeContainer
 
 @CONCLUDE@
 

diff --git a/src/SalomeApp/resources/SalomeApp.xml b/src/SalomeApp/resources/SalomeApp.xml
index 62eaddcfcac092515897d9a6f8d77bdb938fc957..ce3a3e7ae61b486e4212a7dcf055e67afe9fe019 100644 (file)
--- a/src/SalomeApp/resources/SalomeApp.xml
+++ b/src/SalomeApp/resources/SalomeApp.xml
@@ -15,7 +15,6 @@
     <parameter name="xterm"      value="no"/>
     <parameter name="portkill"   value="no"/>
     <parameter name="killall"    value="no"/>
-    <parameter name="modules"    value="GEOM,SMESH,SUPERV,MED"/>
     <parameter name="modules"    value="GEOM,SMESH,SUPERV,MED,VISU"/>
     <parameter name="pyModules"  value=""/>
     <parameter name="embedded"   value="SalomeAppEngine"/>

diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in
index 549f0aa4d6e1c3eb5ad038c0dce3d87aac216324..69ee385f0fcab9ee0f107e47a4b5af63170ef319 100755 (executable)
--- a/src/Session/Makefile.in
+++ b/src/Session/Makefile.in
@@ -60,7 +60,7 @@ CPPFLAGS += $(QT_MT_INCLUDES) $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLA
 CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS)
 LDFLAGS += $(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lsuit -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lSALOMETraceCollector -lEvent -lCASCatch -lSalomeCatalog -lSalomeDS $(CAS_LDPATH) -lTKernel
 
-LDFLAGSFORBIN= $(LDFLAGS)
+LDFLAGSFORBIN= $(LDFLAGS) -lqtx -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry -lSalomeNotification
 
 @CONCLUDE@