From 45b45c2ef300d0fd39fb5759c4017ca89e367175 Mon Sep 17 00:00:00 2001
From: kueller <kueller@504e572c-2e33-0410-9681-be2bf7408885>
Date: Fri, 22 Jan 2010 15:01:46 +0000
Subject: [PATCH] Debugging weitestgehend deaktiviert. gstreamer +
 gst-plugins-* muessen vor qt gebaut werden...

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5195 504e572c-2e33-0410-9681-be2bf7408885
---
 SysBuild/BuildCluster/XBaseLibs.dmk | 9 ++++++---
 SysBuild/BuildCluster/XTools.dmk    | 7 ++-----
 SysBuild/dbase/unixODBC             | 5 ++---
 SysBuild/guibased/qt-all-opensource | 2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/SysBuild/BuildCluster/XBaseLibs.dmk b/SysBuild/BuildCluster/XBaseLibs.dmk
index bde101e..00cc1f0 100644
--- a/SysBuild/BuildCluster/XBaseLibs.dmk
+++ b/SysBuild/BuildCluster/XBaseLibs.dmk
@@ -9,9 +9,9 @@
 0	tools/libungif
 0	guibased/libwmf
 0	guibased/SDL
-32	multimedia/avifile
+0	multimedia/avifile
 0	guibased/ImageMagick
-64	multimedia/libquicktime
+0	multimedia/libquicktime
 0	multimedia/libdv
 0	development/tk
 0	guibased/espgs
@@ -28,10 +28,13 @@
 0	guibased/jasper
 0	guibased/gtk+-2
 0	guibased/gtk+-1
-32	guibased/cairomm
+0	guibased/cairomm
 0	guibased/pangomm
 0	guibased/gtkmm
 0	guibased/gtkglext
+32	multimedia/gstreamer
+0	multimedia/gst-plugins-base
+0	tools/gobject-introspection
 0	guibased/libnotify
 64	guibased/libsexy
 0	guibased/lesstif
diff --git a/SysBuild/BuildCluster/XTools.dmk b/SysBuild/BuildCluster/XTools.dmk
index 83dc298..8b39303 100644
--- a/SysBuild/BuildCluster/XTools.dmk
+++ b/SysBuild/BuildCluster/XTools.dmk
@@ -1,13 +1,10 @@
 0	development/Xdialog
 0	network/gftp
-32	multimedia/mjpegtools
-0	multimedia/gstreamer
-0	multimedia/gst-plugins-base
-0	tools/gobject-introspection
+0	multimedia/mjpegtools
 0	multimedia/gst-plugins-good
 0	development/pygobject
 0	development/pygtk
-64	network/proftpd
+0	network/proftpd
 0	tools/ttf2fft
 0	tools/mtools
 0	development/jdk
diff --git a/SysBuild/dbase/unixODBC b/SysBuild/dbase/unixODBC
index 587c08d..fc38ade 100644
--- a/SysBuild/dbase/unixODBC
+++ b/SysBuild/dbase/unixODBC
@@ -71,7 +71,6 @@
 SRCPATH=DBase/Lib
 
 premk() {
-	export STQTDIR=$QTDIR
 	if [ ! -d /var/install/qt-all-opensource* ]; then
 		GUIOPTIONS="--enable-gui=no"
 	else
@@ -103,7 +102,6 @@ mk32() {
 }
 
 mk() {
-	export QTDIR=$STQTDIR
 	if [ "$MK64BIT" == "true" ]; then
 		ADDOPTIONS="--libdir=\${prefix}/lib64"
 	fi
@@ -118,10 +116,11 @@ mk() {
 		    --enable-threads \
 		    --enable-driver \
 		    --with-gnu-ld  \
-		    --sysconfdir=/etc/sysconfig/unixODBC &&
+		    --sysconfdir=/etc/sysconfig/unixODBC 
 	if [ "$MK64BIT" == "true" ]; then
 		sed -i -e "s/\/lib /\/lib64 /g" libtool 
 		sed -i -e "s/\/lib\"/\/lib64\"/g" libtool
+		sed -i -e "s/\/lib\//\/lib64\//g" libtool
 	fi
 	make -j $NUMCPU &&
 	make -j $NUMCPU install &&
diff --git a/SysBuild/guibased/qt-all-opensource b/SysBuild/guibased/qt-all-opensource
index c8e7402..251262f 100644
--- a/SysBuild/guibased/qt-all-opensource
+++ b/SysBuild/guibased/qt-all-opensource
@@ -124,7 +124,7 @@ mk32() {
 			  -release \
 			  -confirm-license \
 			  -scripttools \
-			  -opensource &&
+			  -opensource 
 	make -j $NUMCPU
 	make -j $NUMCPU install 
 	cd ../qt-*