From 2e27e66f278d776dbce5a7733d6db63c90a7df9e Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Tue, 23 Mar 2004 07:21:43 +0000
Subject: cleanup: replace some last manual lib install+symlink with calls to
 oe_soinstall.

BKrev: 405fe587cQlZLeatBrb4J3NSLsbEqQ
---
 adns/adns_1.0.oe             |  4 +--
 alsa-lib/alsa-lib_0.9.8.oe   |  6 ++--
 alsa-oss/alsa-oss_0.9.8.oe   |  4 +--
 apmd/apmd_3.2.0.oe           | 62 ++++++++++++++++----------------
 atk/atk_1.2.0.oe             |  4 +--
 bluez-libs/bluez-libs_2.4.oe |  7 ++--
 bluez-sdp/bluez-sdp_1.5.oe   |  7 ++--
 bzip2/bzip2_1.0.2.oe         | 11 ++----
 gpm/gpm_1.20.1.oe            |  3 +-
 gtk+/gtk+_2.2.4.oe           |  9 ++---
 jpeg/jpeg_6b.oe              |  4 +--
 libesmtp/libesmtp_1.0.1.oe   |  4 +--
 libxine/libxine_1.6.0.oe     | 85 +++++++++++++++++++++-----------------------
 lzo/lzo_1.08.oe              |  4 +--
 ncurses/ncurses_5.3.oe       |  8 ++---
 openssl/openssl_0.9.7b.oe    |  6 ++--
 openssl/openssl_0.9.7c.oe    |  6 ++--
 x11/x11-cvs.oe               |  6 ++--
 zlib/zlib_1.1.4.oe           |  4 +--
 19 files changed, 100 insertions(+), 144 deletions(-)

diff --git a/adns/adns_1.0.oe b/adns/adns_1.0.oe
index 6bc05b7e06..25c75dacea 100644
--- a/adns/adns_1.0.oe
+++ b/adns/adns_1.0.oe
@@ -17,9 +17,7 @@ do_configure_prepend () {
 do_stage () {
 	install -m 0644 ${S}/src/adns.h ${STAGING_INCDIR}/
 	install -m 0644 ${S}/src/libadns.a ${STAGING_LIBDIR}/
-	install -m 0755 ${S}/dynamic/libadns.so.${PV} ${STAGING_LIBDIR}/
-	ln -sf libadns.so.1.0 ${STAGING_LIBDIR}/libadns.so.1
-	ln -sf libadns.so.1.0 ${STAGING_LIBDIR}/libadns.so
+	oe_soinstall dynamic/libadns.so.1.0 ${STAGING_LIBDIR}/
 }
 
 do_install () {
diff --git a/alsa-lib/alsa-lib_0.9.8.oe b/alsa-lib/alsa-lib_0.9.8.oe
index 89d4941cb0..8b9f24cba3 100644
--- a/alsa-lib/alsa-lib_0.9.8.oe
+++ b/alsa-lib/alsa-lib_0.9.8.oe
@@ -11,9 +11,9 @@ inherit autotools libtool pkgconfig
 EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
 
 do_stage () {
-	install -m 0755 src/.libs/libasound.so.2.0.0 ${STAGING_LIBDIR}/
-	ln -sf libasound.so.2.0.0 ${STAGING_LIBDIR}/libasound.so.2
-	ln -sf libasound.so.2.0.0 ${STAGING_LIBDIR}/libasound.so
+	oe_soinstall src/.libs/libasound.so.2.0.0 ${STAGING_LIBDIR}/
+	install -m 0644 src/.libs/libasound.lai ${STAGING_LIBDIR}/libasound.la
+	install -m 0644 src/.libs/libasound.a ${STAGING_LIBDIR}/
 	install -d ${STAGING_INCDIR}/alsa/sound
 	install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
 	install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/
diff --git a/alsa-oss/alsa-oss_0.9.8.oe b/alsa-oss/alsa-oss_0.9.8.oe
index 7b024abc72..b42575754d 100644
--- a/alsa-oss/alsa-oss_0.9.8.oe
+++ b/alsa-oss/alsa-oss_0.9.8.oe
@@ -14,9 +14,7 @@ do_configure_prepend () {
 }
 
 do_stage () {
-	install -m 0755 .libs/libaoss.so.0.0.0 ${STAGING_LIBDIR}/
-	ln -sf libaoss.so.0.0.0 ${STAGING_LIBDIR}/libaoss.so.0
-	ln -sf libaoss.so.0.0.0 ${STAGING_LIBDIR}/libaoss.so
+	oe_soinstall .libs/libaoss.so.0.0.0 ${STAGING_LIBDIR}/
 	install -m 0644 .libs/libaoss.a ${STAGING_LIBDIR}/
 	install -m 0644 .libs/libaoss.lai ${STAGING_LIBDIR}/libaoss.la
 }
diff --git a/apmd/apmd_3.2.0.oe b/apmd/apmd_3.2.0.oe
index a4ca3cd42a..6224f4ae06 100644
--- a/apmd/apmd_3.2.0.oe
+++ b/apmd/apmd_3.2.0.oe
@@ -18,45 +18,43 @@ S = "${WORKDIR}/apmd-${PV}.orig"
 inherit libtool
 
 do_compile() {
-    if [ -e ${STAGING_BINDIR}/${TARGET_SYS}-libtool ]; then
-        LIBTOOL=${STAGING_BINDIR}/${TARGET_SYS}-libtool
-    else
-        LIBTOOL=libtool
-    fi
-    oe_runmake "LIBTOOL=$LIBTOOL" apm apmd
+	if [ -e ${STAGING_BINDIR}/${TARGET_SYS}-libtool ]; then
+	    LIBTOOL=${STAGING_BINDIR}/${TARGET_SYS}-libtool
+	else
+	    LIBTOOL=libtool
+	fi
+	oe_runmake "LIBTOOL=$LIBTOOL" apm apmd
 }
 
 do_stage() {
-    install -m 0755 .libs/libapm.so.1.0.0 ${STAGING_LIBDIR};
+	oe_soinstall .libs/libapm.so.1.0.0 ${STAGING_LIBDIR}/
 }
 
 do_install() {
 
-    install -d ${D}/${sysconfdir}
-    install -d ${D}/${sysconfdir}/apm
-    install -d ${D}/${sysconfdir}/apm/event.d
-    install -d ${D}/${sysconfdir}/apm/other.d
-    install -d ${D}/${sysconfdir}/apm/suspend.d
-    install -d ${D}/${sysconfdir}/apm/resume.d
-    install -d ${D}/${sysconfdir}/apm/scripts.d
-    install -d ${D}/${sysconfdir}/default
-    install -d ${D}/${sysconfdir}/init.d
-    install -d ${D}/${sbindir}
-    install -d ${D}/${bindir}
-    install -d ${D}/${libdir}
-    install -d ${D}/${datadir}/apmd
-    install -m 4755 ${S}/.libs/apm ${D}/${bindir}/apm.orig
-    install -m 0755 ${FILESDIR}/apmwrapper ${D}/${bindir}/apm
-    install -m 0755 ${S}/.libs/apmd ${D}/${sbindir}/apmd
-    install -m 0755 ${S}/debian/apmd_proxy ${D}/${sysconfdir}/apm/
-    install -m 0644 ${S}/debian/apmd_proxy.conf ${D}/${datadir}/apmd/
-    install -m 0644 ${S}/debian/apmd.default ${D}/${sysconfdir}/default/apmd
-    install -m 0755 .libs/libapm.so.1.0.0 ${D}/${libdir}
-    ln -sf ./libapm.so.1.0.0 ${D}/${libdir}/libapm.so.1.0
-    ln -sf ./libapm.so.1.0.0 ${D}/${libdir}/libapm.so.1
-                
-    cat ${FILESDIR}/init | sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' > ${D}/${sysconfdir}/init.d/apmd
-    chmod 755 ${D}/${sysconfdir}/init.d/apmd
+	install -d ${D}/${sysconfdir}
+	install -d ${D}/${sysconfdir}/apm
+	install -d ${D}/${sysconfdir}/apm/event.d
+	install -d ${D}/${sysconfdir}/apm/other.d
+	install -d ${D}/${sysconfdir}/apm/suspend.d
+	install -d ${D}/${sysconfdir}/apm/resume.d
+	install -d ${D}/${sysconfdir}/apm/scripts.d
+	install -d ${D}/${sysconfdir}/default
+	install -d ${D}/${sysconfdir}/init.d
+	install -d ${D}/${sbindir}
+	install -d ${D}/${bindir}
+	install -d ${D}/${libdir}
+	install -d ${D}/${datadir}/apmd
+	install -m 4755 ${S}/.libs/apm ${D}/${bindir}/apm.orig
+	install -m 0755 ${FILESDIR}/apmwrapper ${D}/${bindir}/apm
+	install -m 0755 ${S}/.libs/apmd ${D}/${sbindir}/apmd
+	install -m 0755 ${S}/debian/apmd_proxy ${D}/${sysconfdir}/apm/
+	install -m 0644 ${S}/debian/apmd_proxy.conf ${D}/${datadir}/apmd/
+	install -m 0644 ${S}/debian/apmd.default ${D}/${sysconfdir}/default/apmd
+	oe_soinstall .libs/libapm.so.1.0.0 ${D}/${libdir}/
+	            
+	cat ${FILESDIR}/init | sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' > ${D}/${sysconfdir}/init.d/apmd
+	chmod 755 ${D}/${sysconfdir}/init.d/apmd
 }
 
 pkg_postinst () {
diff --git a/atk/atk_1.2.0.oe b/atk/atk_1.2.0.oe
index a31207f74d..184876f765 100644
--- a/atk/atk_1.2.0.oe
+++ b/atk/atk_1.2.0.oe
@@ -14,11 +14,9 @@ CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \
 	 	  -I${STAGING_INCDIR}/glib-2.0/gobject"
 
 do_stage () {
-	install -m 0755 atk/.libs/libatk-1.0.so.0.200.0 ${STAGING_LIBDIR}/
+	oe_soinstall atk/.libs/libatk-1.0.so.0.200.0 ${STAGING_LIBDIR}/
 	install -m 0755 atk/.libs/libatk-1.0.lai ${STAGING_LIBDIR}/libatk-1.0.la
 	install -m 0755 atk/.libs/libatk-1.0.a ${STAGING_LIBDIR}/
-	ln -sf libatk-1.0.so.0.200.0 ${STAGING_LIBDIR}/libatk-1.0.so.0
-	ln -sf libatk-1.0.so.0.200.0 ${STAGING_LIBDIR}/libatk-1.0.so
 	install -d ${STAGING_INCDIR}/atk
 	install -m 0644 atk/atkaction.h ${STAGING_INCDIR}/atk/atkaction.h
 	install -m 0644 atk/atkcomponent.h ${STAGING_INCDIR}/atk/atkcomponent.h
diff --git a/bluez-libs/bluez-libs_2.4.oe b/bluez-libs/bluez-libs_2.4.oe
index f84d93bab5..5fbb504c74 100644
--- a/bluez-libs/bluez-libs_2.4.oe
+++ b/bluez-libs/bluez-libs_2.4.oe
@@ -12,10 +12,8 @@ inherit autotools libtool
 
 do_stage () {
 	install -m 0644 src/.libs/libbluetooth.a ${STAGING_LIBDIR}/
-	install -m 0755 src/.libs/libbluetooth.so.1.0.2 ${STAGING_LIBDIR}/
-
-	ln -sf ${STAGING_LIBDIR}/libbluetooth.so.1.0.2 ${STAGING_LIBDIR}/libbluetooth.so.1
-	ln -sf ${STAGING_LIBDIR}/libbluetooth.so.1.0.2 ${STAGING_LIBDIR}/libbluetooth.so
+	install -m 0644 src/.libs/libbluetooth.lai ${STAGING_LIBDIR}/libbluetooth.la
+	oe_soinstall src/.libs/libbluetooth.so.1.0.2 ${STAGING_LIBDIR}/
 
 	install -d ${STAGING_INCDIR}/bluetooth
 	for X in bluetooth.h hci.h hci_lib.h hci_uart.h hci_vhci.h l2cap.h \
@@ -23,5 +21,4 @@ do_stage () {
 	do
 		install -m 0644 include/${X} ${STAGING_INCDIR}/bluetooth/${X}
 	done
-	install -m 0644 src/.libs/libbluetooth.lai ${STAGING_LIBDIR}/libbluetooth.la
 }
diff --git a/bluez-sdp/bluez-sdp_1.5.oe b/bluez-sdp/bluez-sdp_1.5.oe
index 107817c775..088df86839 100644
--- a/bluez-sdp/bluez-sdp_1.5.oe
+++ b/bluez-sdp/bluez-sdp_1.5.oe
@@ -16,14 +16,11 @@ inherit autotools libtool
 do_stage () {
 	install -m 0644 libs/.libs/libsdp.a ${STAGING_LIBDIR}/
 	install -m 0644 libs/.libs/libsdp.lai ${STAGING_LIBDIR}/libsdp.la
-	install -m 0755 libs/.libs/libsdp.so.2.0.1 ${STAGING_LIBDIR}/
-
-	ln -sf ${STAGING_LIBDIR}/libsdp.so.2.0.1 ${STAGING_LIBDIR}/libsdp.so.2
-	ln -sf ${STAGING_LIBDIR}/libsdp.so.2.0.1 ${STAGING_LIBDIR}/libsdp.so
+	oe_soinstall libs/.libs/libsdp.so.2.0.1 ${STAGING_LIBDIR}/
 
 	for X in sdp.h sdp_lib.h
 	do
-		install -m 0644 include/${X} ${STAGING_INCDIR}/bluetooth/${X}
+		install -m 0644 include/$X ${STAGING_INCDIR}/bluetooth/$X
 	done
 
 }
diff --git a/bzip2/bzip2_1.0.2.oe b/bzip2/bzip2_1.0.2.oe
index f0797e519f..06bc61986c 100644
--- a/bzip2/bzip2_1.0.2.oe
+++ b/bzip2/bzip2_1.0.2.oe
@@ -18,17 +18,12 @@ do_compile () {
 do_stage () {
 	install -m 0644 libbz2.a ${STAGING_LIBDIR}/
 	install -m 0644 bzlib.h ${STAGING_INCDIR}/
-	install -m 0755 libbz2.so.1.0.2 ${STAGING_LIBDIR}/
-	ln -sf libbz2.so.1.0.2 ${STAGING_LIBDIR}/libbz2.so.1.0
-	ln -sf libbz2.so.1.0.2 ${STAGING_LIBDIR}/libbz2.so.1
-	ln -sf libbz2.so.1.0.2 ${STAGING_LIBDIR}/libbz2.so
+	oe_soinstall libbz2.so.1.0.2 ${STAGING_LIBDIR}/
 }
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install
 	install -d ${D}/${libdir}
-	install -m 0755 libbz2.so.1.0.2 ${D}/${libdir}/
-	ln -sf libbz2.so.1.0.2 ${D}/${libdir}/libbz2.so.1.0
-	ln -sf libbz2.so.1.0.2 ${D}/${libdir}/libbz2.so.1
-	ln -sf libbz2.so.1.0.2 ${D}/${libdir}/libbz2.so
+	oe_soinstall libbz2.so.1.0.2 ${D}/${libdir}/
+	install -m 0644 libbz2.a ${D}/${libdir}/
 }
diff --git a/gpm/gpm_1.20.1.oe b/gpm/gpm_1.20.1.oe
index cee85889c3..68036a1ea4 100644
--- a/gpm/gpm_1.20.1.oe
+++ b/gpm/gpm_1.20.1.oe
@@ -17,8 +17,7 @@ do_configure_prepend () {
 do_stage () {
 	install -m 0644 src/headers/gpm.h ${STAGING_INCDIR}/
 	install -m 0644 src/lib/libgpm.a ${STAGING_LIBDIR}/
-	install -m 0755 src/lib/libgpm.so.1.19.0 ${STAGING_LIBDIR}/
-	ln -sf libgpm.so.1.19.0 ${STAGING_LIBDIR}/libgpm.so
+	oe_soinstall src/lib/libgpm.so.1.19.0 ${STAGING_LIBDIR}/
 }
 
 do_install () {
diff --git a/gtk+/gtk+_2.2.4.oe b/gtk+/gtk+_2.2.4.oe
index b096deca4f..8be4bb2a1e 100644
--- a/gtk+/gtk+_2.2.4.oe
+++ b/gtk+/gtk+_2.2.4.oe
@@ -34,20 +34,17 @@ gdk_include = gdk.h gdkcolor.h gdkcursor.h gdkdisplay.h gdkdisplaymanager.h gdkd
 gdk_pixbuf_include = gdk-pixbuf-animation.h gdk-pixbuf-enum-types.h gdk-pixbuf-features.h gdk-pixbuf-io.h gdk-pixbuf-loader.h gdk-pixbuf-marshal.h gdk-pixbuf.h gdk-pixdata.h
 
 do_stage () {
-	install -m 0755 gtk/.libs/libgtk-x11-2.0.so.${SOV} ${STAGING_LIBDIR}/libgtk-x11-2.0.so.${SOV}
+	oe_soinstall gtk/.libs/libgtk-x11-2.0.so.${SOV} ${STAGING_LIBDIR}/
 	install -m 0644 gtk/.libs/libgtk-x11-2.0.lai ${STAGING_LIBDIR}/libgtk-x11-2.0.la
 	install -m 0644 gtk/.libs/libgtk-x11-2.0.a ${STAGING_LIBDIR}/libgtk-x11-2.0.a
-	ln -s libgtk-x11-2.0.so.${SOV} ${STAGING_LIBDIR}/libgtk-x11-2.0.so
 
-	install -m 0755 gdk/.libs/libgdk-x11-2.0.so.${SOV} ${STAGING_LIBDIR}/libgdk-x11-2.0.so.${SOV}
+	oe_soinstall gdk/.libs/libgdk-x11-2.0.so.${SOV} ${STAGING_LIBDIR}/
 	install -m 0644 gdk/.libs/libgdk-x11-2.0.lai ${STAGING_LIBDIR}/libgdk-x11-2.0.la
 	install -m 0644 gdk/.libs/libgdk-x11-2.0.a ${STAGING_LIBDIR}/libgdk-x11-2.0.a	
-	ln -s libgdk-x11-2.0.so.${SOV} ${STAGING_LIBDIR}/libgdk-x11-2.0.so
 
-	install -m 0755 gdk-pixbuf/.libs/libgdk_pixbuf-2.0.so.${SOV} ${STAGING_LIBDIR}/libgdk_pixbuf-2.0.so.${SOV}
+	oe_soinstall gdk-pixbuf/.libs/libgdk-pixbuf-x11-2.0.so.${SOV} ${STAGING_LIBDIR}/
 	install -m 0644 gdk-pixbuf/.libs/libgdk_pixbuf-2.0.lai ${STAGING_LIBDIR}/libgdk_pixbuf-2.0.la
 	install -m 0644 gdk-pixbuf/.libs/libgdk_pixbuf-2.0.a ${STAGING_LIBDIR}/libgdk_pixbuf-2.0.a	
-	ln -s libgdk_pixbuf-2.0.so.${SOV} ${STAGING_LIBDIR}/libgdk_pixbuf-2.0.so
 
 	mkdir -p ${STAGING_INCDIR}/gtk-2.0/gtk
 	for i in ${gtk_include}; do
diff --git a/jpeg/jpeg_6b.oe b/jpeg/jpeg_6b.oe
index eb2b9a135d..07115176ae 100644
--- a/jpeg/jpeg_6b.oe
+++ b/jpeg/jpeg_6b.oe
@@ -21,9 +21,7 @@ do_stage() {
 	install -m 644 -D jmorecfg.h ${STAGING_INCDIR}/jmorecfg.h
 	install -m 644 -D jerror.h ${STAGING_INCDIR}/jerror.h
 	install -m 644 -D jpegint.h ${STAGING_INCDIR}/jpegint.h
-	install -m 755 -D .libs/libjpeg.so.62.0.0 ${STAGING_LIBDIR}/libjpeg.so.62.0.0
-	ln -sf libjpeg.so.62.0.0 ${STAGING_LIBDIR}/libjpeg.so.62
-	ln -sf libjpeg.so.62.0.0 ${STAGING_LIBDIR}/libjpeg.so
+	oe_soinstall .libs/libjpeg.so.62.0.0 ${STAGING_LIBDIR}/
 }
 
 do_install() {
diff --git a/libesmtp/libesmtp_1.0.1.oe b/libesmtp/libesmtp_1.0.1.oe
index 55044b2e3c..c8d27adc33 100644
--- a/libesmtp/libesmtp_1.0.1.oe
+++ b/libesmtp/libesmtp_1.0.1.oe
@@ -15,9 +15,7 @@ EXTRA_OECONF = "--disable-isoc --with-openssl=${STAGING_LIBDIR}/.."
 do_stage () {
 	install -m 0644 .libs/libesmtp.a ${STAGING_LIBDIR}/
 	install -m 0644 .libs/libesmtp.lai ${STAGING_LIBDIR}/libesmtp.la
-	install -m 0644 .libs/libesmtp.so.5.1.2 ${STAGING_LIBDIR}/
-	ln -sf libesmtp.so.5.1.2 ${STAGING_LIBDIR}/libesmtp.so.5
-	ln -sf libesmtp.so.5.1.2 ${STAGING_LIBDIR}/libesmtp.so
+	oe_soinstall .libs/libesmtp.so.5.1.2 ${STAGING_LIBDIR}/
 
         install -d ${STAGING_DIR}/include
 	install -m 644 auth-client.h ${STAGING_INCDIR}
diff --git a/libxine/libxine_1.6.0.oe b/libxine/libxine_1.6.0.oe
index 534cf88dc3..41936ba556 100644
--- a/libxine/libxine_1.6.0.oe
+++ b/libxine/libxine_1.6.0.oe
@@ -10,63 +10,58 @@ inherit autotools
 S = "${WORKDIR}/xine-lib"
 
 SRC_URI = "cvs://anonymous@cvs.xine.sf.net/cvsroot/xine;module=xine-lib;tag=xine-1-beta12-release \
-        file://${FILESDIR}/full.patch;patch=1 \
-	file://${FILESDIR}/libvorbis.patch;patch=0 \
-        file://${FILESDIR}/demux_ogg.patch;patch=0 \
-        file://${FILESDIR}/configure.ac.patch;patch=0 \
-        file://${FILESDIR}/vo_scale.patch;patch=0"
+	   file://${FILESDIR}/full.patch;patch=1 \
+	   file://${FILESDIR}/libvorbis.patch;patch=0 \
+	   file://${FILESDIR}/demux_ogg.patch;patch=0 \
+	   file://${FILESDIR}/configure.ac.patch;patch=0 \
+	   file://${FILESDIR}/vo_scale.patch;patch=0"
 
 do_configure() {
-  ./autogen.sh --host ${TARGET_SYS} --build ${BUILD_SYS} \
-        --enable-shared --disable-static --prefix=${prefix} \
-        --with-zlib-path=${STAGING_DIR} --with-vorbis-prefix=${STAGING_DIR} \
-        --disable-oggtest --with-ogg-prefix=${STAGING_DIR} --without-x \
+	./autogen.sh --host ${TARGET_SYS} --build ${BUILD_SYS} \
+	      --enable-shared --disable-static --prefix=${prefix} \
+	      --with-zlib-path=${STAGING_DIR} --with-vorbis-prefix=${STAGING_DIR} \
+	      --disable-oggtest --with-ogg-prefix=${STAGING_DIR} --without-x \
 	--disable-iconv --disable-nls --without-arts --without-sdl \
 	--disable-aalib
 }
 
 do_compile() {
-  oe_runmake LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool
+	oe_runmake LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool
 }
 
 # ug - we don't do elegant/purdy today
 do_install() {
-  oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
-    -C src install-data \
-    'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
-    'includedir=${D}/${includedir}'
-  oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
-    -C include install-data \
-    'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
-    'includedir=${D}/${includedir}'
-  install -m 0755 -d ${D}/${libdir}/xine/plugins/1.0.0
-  for plugin in `find ${S}/src -type f -name xineplug*.la`; do 
-    dso=`dirname $plugin`/.libs/`basename $plugin .la`.so 
-    install -m 0755 $dso ${D}/${libdir}/xine/plugins/1.0.0
-  done
-  install -m 0755 src/xine-engine/.libs/libxine.so.${PV} ${D}${libdir}
-  ln -fs libxine.so.$PV ${D}${libdir}/libxine.so.1
-  ln -fs libxine.so.$PV ${D}${libdir}/libxine.so
+	oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
+	  -C src install-data \
+	  'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
+	  'includedir=${D}/${includedir}'
+	oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
+	  -C include install-data \
+	  'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
+	  'includedir=${D}/${includedir}'
+	install -m 0755 -d ${D}/${libdir}/xine/plugins/1.0.0
+	for plugin in `find ${S}/src -type f -name xineplug*.la`; do 
+	  dso=`dirname $plugin`/.libs/`basename $plugin .la`.so 
+	  install -m 0755 $dso ${D}/${libdir}/xine/plugins/1.0.0
+	done
+	oe_soinstall src/xine-engine/.libs/libxine.so.${PV} ${D}/${libdir}/
 }
 
 do_stage() {
-  oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
-    -C src install-data \
-    'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \
-    'libdir=${STAGING_LIBDIR}' \
-    'includedir=${STAGING_INCDIR}'
-  oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
-    -C include install-data \
-    'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \
-    'libdir=${STAGING_LIBDIR}' \
-    'includedir=${STAGING_INCDIR}'
-  install -m 0755 -d ${STAGING_LIBDIR}/xine/plugins/1.0.0
-  for plugin in `find ${S}/src -type f -name xineplug*.la`; do 
-    dso=`dirname $plugin`/.libs/`basename $plugin .la`.so 
-    install -m 0755 $dso ${STAGING_LIBDIR}/xine/plugins/1.0.0
-  done
-  install -m 0755 src/xine-engine/.libs/libxine.so.${PV} \
-    ${STAGING_LIBDIR}
-  ln -fs libxine.so.$PV ${STAGING_LIBDIR}/libxine.so.1
-  ln -fs libxine.so.$PV ${STAGING_LIBDIR}/libxine.so
+	oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
+	  -C src install-data \
+	  'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \
+	  'libdir=${STAGING_LIBDIR}' \
+	  'includedir=${STAGING_INCDIR}'
+	oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
+	  -C include install-data \
+	  'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \
+	  'libdir=${STAGING_LIBDIR}' \
+	  'includedir=${STAGING_INCDIR}'
+	install -m 0755 -d ${STAGING_LIBDIR}/xine/plugins/1.0.0
+	for plugin in `find ${S}/src -type f -name xineplug*.la`; do 
+		dso=`dirname $plugin`/.libs/`basename $plugin .la`.so 
+		install -m 0755 $dso ${STAGING_LIBDIR}/xine/plugins/1.0.0
+	done
+	oe_soinstall src/xine-engine/.libs/libxine.so.${PV} ${STAGING_LIBDIR}/
 }
diff --git a/lzo/lzo_1.08.oe b/lzo/lzo_1.08.oe
index 390bd4a3d0..cae712276b 100644
--- a/lzo/lzo_1.08.oe
+++ b/lzo/lzo_1.08.oe
@@ -28,8 +28,6 @@ do_stage() {
 	install -m 0644 include/lzoconf.h ${STAGING_INCDIR}/lzoconf.h
 	install -m 0644 include/lzoutil.h ${STAGING_INCDIR}/lzoutil.h
 
-        install -m 0755 src/.libs/liblzo.so.1.0.0 ${STAGING_LIBDIR}/liblszo.so.1.0.0
-	ln -sf liblzo.so.1.0.0 ${STAGING_LIBDIR}/liblzo.so.1
-	ln -sf liblzo.so.1.0.0 ${STAGING_LIBDIR}/liblzo.so
+	oe_soinstall src/.libs/liblzo.so.1.0.0 ${STAGING_LIBDIR}/
 	install -m 0644 src/.libs/liblzo.a ${STAGING_LIBDIR}/liblzo.a
 }
diff --git a/ncurses/ncurses_5.3.oe b/ncurses/ncurses_5.3.oe
index eb60c04fb3..812da9f3bd 100644
--- a/ncurses/ncurses_5.3.oe
+++ b/ncurses/ncurses_5.3.oe
@@ -49,14 +49,12 @@ do_compile () {
 }
 
 do_stage () {
-	install -m 0755 lib/lib*.so.* ${STAGING_LIBDIR}/
 	for h in ncurses_*.h curses.h eti.h form.h menu.h panel.h \
 		termcap.h term.h unctrl.h; do
 		       install -m 0644 include/$h ${STAGING_INCDIR}/
 	done
 	ln -sf curses.h ${STAGING_INCDIR}/ncurses.h
-	ln -sf libpanel.so.5.3 ${STAGING_LIBDIR}/libpanel.so
-	ln -sf libform.so.5.3 ${STAGING_LIBDIR}/libform.so
-	ln -sf libmenu.so.5.3 ${STAGING_LIBDIR}/libmenu.so
-	ln -sf libncurses.so.5.3 ${STAGING_LIBDIR}/libncurses.so
+	for i in ncurses panel form menu; do
+		oe_soinstall lib/lib$i.so.5.3 ${STAGING_LIBDIR}/
+	done
 }
diff --git a/openssl/openssl_0.9.7b.oe b/openssl/openssl_0.9.7b.oe
index c976ced8e5..ce88c79745 100644
--- a/openssl/openssl_0.9.7b.oe
+++ b/openssl/openssl_0.9.7b.oe
@@ -34,10 +34,8 @@ do_compile () {
 
 do_stage () {
 	cp --dereference -R include/openssl ${STAGING_INCDIR}/
-	install -m 0755 libcrypto.so.0.9.7 ${STAGING_LIBDIR}/
-	ln -sf libcrypto.so.0.9.7 ${STAGING_LIBDIR}/libcrypto.so
-	install -m 0755 libssl.so.0.9.7 ${STAGING_LIBDIR}/
-	ln -sf libssl.so.0.9.7 ${STAGING_LIBDIR}/libssl.so
+	oe_soinstall libcrypto.so.0.9.7 ${STAGING_LIBDIR}/
+	oe_soinstall libssl.so.0.9.7 ${STAGING_LIBDIR}/
 }
 
 do_install () {
diff --git a/openssl/openssl_0.9.7c.oe b/openssl/openssl_0.9.7c.oe
index fd80e7d3c1..526f42513b 100644
--- a/openssl/openssl_0.9.7c.oe
+++ b/openssl/openssl_0.9.7c.oe
@@ -34,10 +34,8 @@ do_compile () {
 
 do_stage () {
 	cp --dereference -R include/openssl ${STAGING_INCDIR}/
-	install -m 0755 libcrypto.so.0.9.7 ${STAGING_LIBDIR}/
-	ln -sf libcrypto.so.0.9.7 ${STAGING_LIBDIR}/libcrypto.so
-	install -m 0755 libssl.so.0.9.7 ${STAGING_LIBDIR}/
-	ln -sf libssl.so.0.9.7 ${STAGING_LIBDIR}/libssl.so
+	oe_soinstall libcrypto.so.0.9.7 ${STAGING_LIBDIR}/
+	oe_soinstall libssl.so.0.9.7 ${STAGING_LIBDIR}/
 	install -m 0644 libcrypto.a ${STAGING_LIBDIR}/
 	install -m 0644 libssl.a ${STAGING_LIBDIR}/
 }
diff --git a/x11/x11-cvs.oe b/x11/x11-cvs.oe
index 9c9ef32128..62d7c1a402 100644
--- a/x11/x11-cvs.oe
+++ b/x11/x11-cvs.oe
@@ -34,9 +34,7 @@ do_stage() {
 	install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h
 	install -c -m 644 include/X11/ImUtil.h ${STAGING_INCDIR}/X11/ImUtil.h
 	
-	install -c src/.libs/libX11.so.6.2.1 ${STAGING_LIBDIR}/libX11.so.6.2.1
-	ln -sf libX11.so.6.2.1 ${STAGING_LIBDIR}/libX11.so.6
-	ln -sf libX11.so.6.2.1 ${STAGING_LIBDIR}/libX11.so
-
+	oe_soinstall src/.libs/libX11.so.6.2.1 ${STAGING_LIBDIR}/
 	install -c -m 644 src/.libs/libX11.a ${STAGING_LIBDIR}/libX11.a
+	install -c -m 644 src/.libs/libX11.lai ${STAGING_LIBDIR}/libX11.la
 }
diff --git a/zlib/zlib_1.1.4.oe b/zlib/zlib_1.1.4.oe
index b4c312a84f..1ee79f1466 100644
--- a/zlib/zlib_1.1.4.oe
+++ b/zlib/zlib_1.1.4.oe
@@ -22,10 +22,8 @@ do_compile() {
 do_stage() {
 	install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h
 	install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h
-	install -m 0755 libz.so.${PV} ${STAGING_LIBDIR}/libz.so.${PV}
 	install -m 0755 libz.a ${STAGING_LIBDIR}/libz.a
-	ln -sf ./libz.so.1.1.4 ${STAGING_LIBDIR}/libz.so.1
-	ln -sf ./libz.so.1.1.4 ${STAGING_LIBDIR}/libz.so
+	oe_soinstall libz.so.1.1.4 ${STAGING_LIBDIR}/
 }
 
 do_install() {
-- 
cgit v1.2.3