DEPENDS = "virtual/libc libxml2 gtk+"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 
-SRC_URI = ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/2.0/${P}.tar.bz2
+SRC_URI = ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/2.0/${P}.tar.bz2 \
+         file://${FILESDIR}/glade-cruft.patch;patch=1;pnum=0
 
 inherit autotools pkgconfig libtool
 
 }
 
 do_stage () {
-       install -m 0755 glade/.libs/${libname} ${STAGING_LIBDIR}/
-       ln -sf ${libname} ${STAGING_LIBDIR}/libglade-2.0.so.2
-       ln -sf ${libname} ${STAGING_LIBDIR}/libglade-2.0.so
+       oe_soinstall glade/.libs/${LIBNAME} ${STAGING_LIBDIR}/
        install -m 0644 glade/.libs/libglade-2.0.lai ${STAGING_LIBDIR}/libglade-2.0.la
 
        mkdir -p ${STAGING_INCDIR}/libglade-2.0/glade
 
 RDEPENDS = "gtk"
 DEPENDS = "gtk+"
 
-inherit pkgconfig
+inherit pkgconfig gpe
 
 SRC_URI = http://gpe.handhelds.org/pub/projects/gpe/source/libgpewidget-${PV}.tar.gz
 
 headers = "init.h render.h errorbox.h smallbox.h pixmaps.h gtkdatecombo.h dirbrowser.h stylus.h picturebutton.h spacing.h translabel.h question.h windows.h gpe-iconlist.h gtksimplemenu.h gpewindowlist.h tray.h popup.h"
 
 do_stage () {
-       install -m 0755 libgpewidget.so.1 ${STAGING_LIBDIR}/
-       ln -s libgpewidget.so.1 ${STAGING_LIBDIR}/libgpewidget.so
+       oe_soinstall libgpewidget.so.1 ${STAGING_LIBDIR}/
 
        mkdir -p ${STAGING_INCDIR}/gpe
        for h in ${headers}; do
                install -m 0644 gpe/$h ${STAGING_INCDIR}/gpe/${h}
        done
 }
-
-do_install() {
-       oe_runmake 'DESTDIR=${D}' install
-}