6 files changed, 15 insertions, 10 deletions
diff --git a/packages/tslib/tslib/h2200/tslib.sh b/packages/tslib/tslib/h2200/tslib.sh
index 7fa6492ce0..90d911818b 100644
--- a/packages/tslib/tslib/h2200/tslib.sh
+++ b/packages/tslib/tslib/h2200/tslib.sh
@@ -15,5 +15,7 @@ case `uname -r` in
 	;;
 esac
 
-export TSLIB_TSDEVICE TSLIB_CONFFILE
+QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE}
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO
 
diff --git a/packages/tslib/tslib/h3600/tslib.sh b/packages/tslib/tslib/h3600/tslib.sh
index b07fce0aea..a1f5205c47 100644
--- a/packages/tslib/tslib/h3600/tslib.sh
+++ b/packages/tslib/tslib/h3600/tslib.sh
@@ -11,5 +11,7 @@ case `uname -r` in
 	;;
 esac
 
-export TSLIB_TSDEVICE TSLIB_CONFFILE
+QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE}
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO
 
diff --git a/packages/tslib/tslib/h3900/tslib.sh b/packages/tslib/tslib/h3900/tslib.sh
index 7fa6492ce0..90d911818b 100644
--- a/packages/tslib/tslib/h3900/tslib.sh
+++ b/packages/tslib/tslib/h3900/tslib.sh
@@ -15,5 +15,7 @@ case `uname -r` in
 	;;
 esac
 
-export TSLIB_TSDEVICE TSLIB_CONFFILE
+QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE}
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO
 
diff --git a/packages/tslib/tslib/h6300/tslib.sh b/packages/tslib/tslib/h6300/tslib.sh
index 95e6a2d02b..8b45c66a1f 100644
--- a/packages/tslib/tslib/h6300/tslib.sh
+++ b/packages/tslib/tslib/h6300/tslib.sh
@@ -2,6 +2,7 @@
 
 TSLIB_TSDEVICE=`detect-tsdevice`
 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h6300
+QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE}
 
-export TSLIB_TSDEVICE TSLIB_CONFFILE
+export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO
 
diff --git a/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/packages/tslib/tslib/ipaq-pxa270/tslib.sh
index a3eb096a30..3fba531561 100644
--- a/packages/tslib/tslib/ipaq-pxa270/tslib.sh
+++ b/packages/tslib/tslib/ipaq-pxa270/tslib.sh
@@ -2,5 +2,6 @@
 
 TSLIB_TSDEVICE=`detect-tsdevice`
 TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
+QWS_MOUSE_PROTO=TPanel:${TSLIB_TSDEVICE}
 
-export TSLIB_TSDEVICE TSLIB_CONFFILE
+export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index 53b4a0217c..72fb979e5e 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library."
 PV = "0.0cvs${CVSDATE}"
-PR = "r33"
+PR = "r34"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 PACKAGE_ARCH_tslib-conf = "${MACHINE}"
@@ -41,10 +41,7 @@ EXTRA_OECONF_mnci   = "--enable-shared --disable-h3600 --enable-input --disable-
 EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
 
 do_stage () {
-	oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR}
-	ln -sf libts-0.0.so ${STAGING_LIBDIR}/libts.so
-	install -m 0644 src/tslib.h ${STAGING_INCDIR}/
-	install -m 0644 src/tslib-private.h ${STAGING_INCDIR}/
+	autotools_stage_all
 }
 
 do_install_prepend () {