From 81553d3d8fadb1a3ea36cd4aecc99f1463ca9bbf Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Fri, 1 Jun 2007 13:45:46 +0000
Subject: [PATCH] Porting to Qt 4

---
 src/OCCViewer/Makefile.am   | 3 ++-
 src/OCCViewer/OCCViewer.pro | 2 +-
 src/SOCC/Makefile.am        | 4 ++--
 src/SVTK/Makefile.am        | 3 +--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/OCCViewer/Makefile.am b/src/OCCViewer/Makefile.am
index c244074a1..bc14c02ef 100755
--- a/src/OCCViewer/Makefile.am
+++ b/src/OCCViewer/Makefile.am
@@ -92,4 +92,5 @@ nodist_salomeres_DATA = \
 libOCCViewer_la_CPPFLAGS=$(QT_INCLUDES) $(OGL_INCLUDES) $(CAS_CPPFLAGS) \
 	-I$(srcdir)/../SUIT -I$(srcdir)/../Qtx
 
-libOCCViewer_la_LDFLAGS=$(OGL_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_VIEWER) ../SUIT/libsuit.la
+libOCCViewer_la_LDFLAGS=$(OGL_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_VIEWER)
+libOCCViewer_la_LIBADD=../Qtx/libqtx.la ../SUIT/libsuit.la
diff --git a/src/OCCViewer/OCCViewer.pro b/src/OCCViewer/OCCViewer.pro
index 319c23b01..facc53204 100644
--- a/src/OCCViewer/OCCViewer.pro
+++ b/src/OCCViewer/OCCViewer.pro
@@ -16,7 +16,7 @@ CAS_KERNEL = -L$${CASROOT}/Linux/lib -lTKernel
 CAS_VIEWER = -L$${CASROOT}/Linux/lib -lTKV3d -lTKService
 
 INCLUDEPATH += ../../include $${OGL_INCLUDES} $${CAS_CPPFLAGS} ../Qtx ../SUIT
-LIBS += -L../../lib -lsuit $${OGL_LIBS} $${CAS_KERNEL} $${CAS_VIEWER}
+LIBS += -L../../lib -lqtx -lsuit $${OGL_LIBS} $${CAS_KERNEL} $${CAS_VIEWER}
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared
diff --git a/src/SOCC/Makefile.am b/src/SOCC/Makefile.am
index 25db60672..e822208e5 100755
--- a/src/SOCC/Makefile.am
+++ b/src/SOCC/Makefile.am
@@ -46,5 +46,5 @@ libSOCC_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) $(BOOST_CPPFLAGS) \
 	-I$(srcdir)/../OCCViewer -I$(srcdir)/../Qtx
 
 libSOCC_la_LDFLAGS=$(QT_MT_LIBS)
-libSOCC_la_LIBADD= ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la \
-	../Prs/libSalomePrs.la ../OCCViewer/libOCCViewer.la
+libSOCC_la_LIBADD=../Qtx/libqtx.la ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la \
+	          ../Prs/libSalomePrs.la ../OCCViewer/libOCCViewer.la
diff --git a/src/SVTK/Makefile.am b/src/SVTK/Makefile.am
index a00f2eb9e..3fbf0d680 100755
--- a/src/SVTK/Makefile.am
+++ b/src/SVTK/Makefile.am
@@ -118,8 +118,7 @@ libSVTK_la_LDFLAGS= \
 	$(OCC_LIBS) \
 	$(VTK_LIBS)
 
-libSVTK_la_LIBADD= ../Qtx/libqtx.la ../SUIT/libsuit.la ../STD/libstd.la \
-		   ../CAM/libCAM.la ../OBJECT/libSalomeObject.la \
+libSVTK_la_LIBADD= ../Qtx/libqtx.la ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la \
 		   ../Prs/libSalomePrs.la ../VTKViewer/libVTKViewer.la
 
 # Executable
-- 
2.39.2