From: Christian Pulvermacher <christian@hazel.(none)>
Date: Thu, 28 Oct 2010 10:53:27 +0000 (+0200)
Subject: link libvncclient statically
X-Git-Tag: 0.7~3
X-Git-Url: http://vcs.maemo.org/git/?p=presencevnc;a=commitdiff_plain;h=8f83c44ef57cf59698187638a0bf45120dcf21d3

link libvncclient statically
---

diff --git a/debian/rules b/debian/rules
index eac9b67..dd51d7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,6 @@ SOURCEDIR=./
 BUILDDIR=debian/build/
 ICONDIR=usr/share/icons/hicolor/
 BINDIR=usr/bin/
-RESDIR=opt/presencevnc/
 DESKTOP_DIR=usr/share/applications/hildon/
 
 build:
@@ -46,7 +45,7 @@ binary-arch: build install
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	LD_LIBRARY_PATH=debian/presencevnc/${RESDIR} dh_shlibdeps -l debian/presencevnc/${RESDIR}
+	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
@@ -57,11 +56,8 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs ${BINDIR} $(RESDIR)
-	dh_install libvnc/libvncclient/.libs/libvncclient.so.0.0.0 ${RESDIR}
-	mv debian/presencevnc/${RESDIR}libvncclient.so.0.0.0 debian/presencevnc/${RESDIR}libvncclient.so.0
-	dh_install ${BUILDDIR}presencevnc-bin ${RESDIR}
-	dh_install presencevnc ${BINDIR}
+	dh_installdirs ${BINDIR}
+	dh_install ${BUILDDIR}presencevnc ${BINDIR}
 	dh_install presencevnc.desktop $(DESKTOP_DIR)
 	dh_install icons/48x48/presencevnc.png $(ICONDIR)48x48/apps
 	dh_install icons/64x64/presencevnc.png $(ICONDIR)64x64/apps
diff --git a/presencevnc b/presencevnc
deleted file mode 100755
index 1ac412f..0000000
--- a/presencevnc
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-export LD_LIBRARY_PATH=/opt/presencevnc/
-exec /opt/presencevnc/presencevnc-bin "$@"
diff --git a/vnc.pro b/vnc.pro
index ed6eb25..e96a093 100644
--- a/vnc.pro
+++ b/vnc.pro
@@ -1,8 +1,8 @@
 TEMPLATE = app
-TARGET = presencevnc-bin
-LIBS += -Llibvnc/libvncclient/.libs -lvncclient
+TARGET = presencevnc
+LIBS += -ljpeg -Llibvnc/libvncclient/.libs libvnc/libvncclient/.libs/libvncclient.a
 DEFINES += QTONLY
-CONFIG += silent debug
+CONFIG += silent release
 
 maemo5 {
 	QT += maemo5