summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--adns/adns-1.0/fixparsedomainflags.patch (renamed from alsa-oss/alsa-oss-0.9.8/configure.patch)0
-rw-r--r--adns/adns_1.0.oe7
-rw-r--r--alsa-lib/alsa-lib_0.9.8.oe20
-rw-r--r--alsa-lib/alsa-lib_1.0.4.oe (renamed from alsa-oss/alsa-oss-0.9.8/m4.patch)0
-rw-r--r--alsa-oss/alsa-oss-1.0.4/configure.patch (renamed from alsa-utils/alsa-utils-0.9.8/autotools.patch)0
-rw-r--r--alsa-oss/alsa-oss-1.0.4/m4.patch (renamed from alsa-utils/alsa-utils-0.9.8/m4.patch)0
-rw-r--r--alsa-oss/alsa-oss_0.9.8.oe20
-rw-r--r--alsa-oss/alsa-oss_1.0.4.oe0
-rw-r--r--alsa-utils/alsa-utils_0.9.8.oe10
-rw-r--r--alsa-utils/alsa-utils_1.0.4.oe0
-rw-r--r--apmd/apmd_3.2.0.oe4
-rw-r--r--atk/atk_1.2.0.oe6
-rw-r--r--audiofile/audiofile_0.2.6.oe4
-rw-r--r--bluez-libs/bluez-libs_2.4.oe4
-rw-r--r--bluez-sdp/bluez-sdp_1.5.oe4
-rw-r--r--bzip2/bzip2_1.0.2.oe7
-rw-r--r--clucene/clucene_0.8.9.oe20
-rw-r--r--curl/curl_7.10.8.oe4
-rw-r--r--curl/curl_7.11.0.oe4
-rw-r--r--cyrus-sasl/cyrus-sasl_2.1.17.oe4
-rw-r--r--cyrus-sasl/cyrus-sasl_2.1.18.oe4
-rw-r--r--dbus/dbus_0.20.oe10
-rw-r--r--dbus/dbus_0.21.oe10
-rw-r--r--esound/esound-gpe_cvs.oe9
-rw-r--r--expat/expat_1.95.6.oe2
-rw-r--r--expat/expat_1.95.7.oe2
-rw-r--r--fakeroot/fakeroot-native_0.9.0.oe3
-rw-r--r--fam/fam_2.6.10.oe4
-rw-r--r--fam/fam_2.7.0.oe4
-rw-r--r--flexis-zaurus/flexis-zaurus_1.0.0.oe18
-rw-r--r--fontconfig/fontconfig_2.2.92.oe5
-rw-r--r--freetype/freetype-native_2.1.7.oe5
-rw-r--r--freetype/freetype_2.1.7.oe4
-rw-r--r--gdbm/gdbm_1.8.3.oe4
-rw-r--r--glib-2.0/glib-2.0-native_2.2.3.oe18
-rw-r--r--glib-2.0/glib-2.0_2.2.3.oe17
-rw-r--r--gmp/gmp_4.1.2.oe3
-rw-r--r--gpm/gpm_1.20.1.oe3
-rw-r--r--gsl/gsl_1.4.oe4
-rw-r--r--gtk+/gtk+_2.2.4.oe20
-rw-r--r--ipkg/ipkg_0.99.121.oe2
-rw-r--r--irk/irk_0.11.0.oe2
-rw-r--r--jpeg/jpeg_6b.oe2
-rw-r--r--klimt/klimt_0.6.1.oe3
-rw-r--r--korganizer/korganizer-embedded_1.5.0.oe13
-rw-r--r--korganizer/korganizer-embedded_1.7.0.oe27
-rw-r--r--korganizer/korganizer-embedded_1.7.5.oe53
-rw-r--r--libao/libao_0.8.4.oe4
-rw-r--r--libdaemon/libdaemon_0.3.oe4
-rw-r--r--libdisplaymigration/libdisplaymigration_0.28.oe2
-rw-r--r--libdotdesktop/libdotdesktop_0.11.oe23
-rw-r--r--libesmtp/libesmtp_1.0.1.oe4
-rw-r--r--libeventdb/libeventdb_0.15.oe2
-rw-r--r--libgcrypt/libgcrypt_1.1.91.oe4
-rw-r--r--libglade/libglade_2.0.1.oe5
-rw-r--r--libgpepimc/libgpepimc_0.2.oe2
-rw-r--r--libgpepimc/libgpepimc_0.3.oe25
-rw-r--r--libgpevtype/libgpevtype_0.3.oe2
-rw-r--r--libgpewidget/libgpewidget_0.78.oe2
-rw-r--r--libgpg-error/libgpg-error_0.6.oe3
-rw-r--r--libgpg-error/libgpg-error_0.7.oe4
-rw-r--r--libid3tag/libid3tag_0.15.0b.oe2
-rw-r--r--libmad/libmad_0.15.0b.oe3
-rw-r--r--libmatchbox/libmatchbox_1.1.oe5
-rw-r--r--libmatchbox/libmatchbox_1.2.oe7
-rw-r--r--libmikey/libmikey_0.1a.oe21
-rw-r--r--libmikmod/libmikmod_3.1.11.oe5
-rw-r--r--libmikmod/libmikmod_3.2.0-beta2.oe4
-rw-r--r--libmimedir/libmimedir_0.0-20040307.oe6
-rw-r--r--libogg/libogg_1.0.oe4
-rw-r--r--libogg/libogg_1.1.oe4
-rw-r--r--liboop/liboop_1.0.oe4
-rw-r--r--libopie/libopie2_cvs.oe13
-rw-r--r--libpcap/libpcap_0.7.2.oe3
-rw-r--r--libpcap/libpcap_0.8.1.oe3
-rw-r--r--libpcap/libpcap_0.8.3.oe29
-rw-r--r--libpng/libpng_1.2.5.oe5
-rw-r--r--libqpe/libqpe-opie_cvs.oe5
-rw-r--r--libqtaux/libqtaux2_cvs.oe3
-rw-r--r--libschedule/libschedule_0.13.oe25
-rw-r--r--libsdl/libsdl-image_1.2.3.oe4
-rw-r--r--libsdl/libsdl-mixer_1.2.5.oe4
-rw-r--r--libsdl/libsdl-net_1.2.5.oe4
-rw-r--r--libsdl/libsdl-qpe_1.2.7.oe4
-rw-r--r--libsdl/libsdl-ttf_2.0.3.oe4
-rw-r--r--libsdl/libsdl-x11_1.2.7.oe4
-rw-r--r--libsidplay/libsidplay_1.36.57.oe2
-rw-r--r--libsigc++/libsigc++_1.2.5.oe3
-rw-r--r--libtododb/libtododb_0.07.oe2
-rw-r--r--libtool/libtool-cross_1.5.oe29
-rw-r--r--libtool/libtool-native_1.5.oe8
-rw-r--r--libusb/libusb_0.1.7.oe6
-rw-r--r--libvorbis/libvorbis_1.0.1.oe14
-rw-r--r--libxine/libxine_1.0.0-beta12.oe16
-rw-r--r--libxml/libxml2_2.6.7.oe5
-rw-r--r--libxsettings-client/libxsettings-client0_0.12.oe24
-rw-r--r--libxsettings/libxsettings_0.11.oe25
-rw-r--r--lirc/lirc_0.6.6.oe2
-rw-r--r--lzo/lzo_1.08.oe3
-rw-r--r--ncurses/ncurses_5.3.oe2
-rw-r--r--ncurses/ncurses_5.4.oe4
-rw-r--r--openjade/openjade-native_1.3.2.oe13
-rw-r--r--openjade/openjade_1.3.2.oe13
-rw-r--r--openobex/openobex_1.0.1.oe6
-rw-r--r--opensp/opensp-native_1.5.oe4
-rw-r--r--opensp/opensp_1.5.oe4
-rw-r--r--openssl/openssl_0.9.7b.oe4
-rw-r--r--openssl/openssl_0.9.7c.oe6
-rw-r--r--openssl/openssl_0.9.7d.oe45
-rw-r--r--opie-camera/opie-camera_1.0.1.oe4
-rw-r--r--opie-ftplib/opie-ftplib_cvs.oe7
-rw-r--r--pango/pango_1.2.5.oe5
-rw-r--r--pcre/pcre_4.4.oe9
-rw-r--r--pme/pme_1.0.3.oe4
-rw-r--r--popt/popt_1.7.oe4
-rw-r--r--portaudio/portaudio_0.0.19.oe2
-rw-r--r--pth/pth_2.0.0.oe2
-rw-r--r--python/python-pyqt_3.11.oe4
-rw-r--r--python/python-pyqwt_3.10.oe2
-rw-r--r--qplot/qplot_2.0.1cvs.oe15
-rw-r--r--qte/qte_2.3.7.oe4
-rw-r--r--qte/qte_2.3.8-snap.oe5
-rw-r--r--qwt/qwt_4.2.0rc1.oe4
-rw-r--r--readline/readline_4.3.oe4
-rw-r--r--slang/slang_1.4.9.oe4
-rw-r--r--slotsig/slotsig_0.4.oe6
-rw-r--r--smpeg/smpeg_0.4.4+0.4.5cvs20040311.oe8
-rw-r--r--sqlite/sqlite_2.8.9.oe2
-rw-r--r--subapplet/subapplet_1.0.8.oe19
-rw-r--r--sword/sword_1.5.7.oe23
-rw-r--r--t1lib/t1lib_5.0.0.oe3
-rw-r--r--t1lib/t1lib_5.0.1.oe3
-rw-r--r--tslib/tslib.oe2
-rw-r--r--x11/x11-cvs.oe6
-rw-r--r--xmms-embedded/xmms-embedded_20040327.oe12
-rw-r--r--xpm/xpm-cvs.oe4
-rw-r--r--zlib/zlib_1.1.4.oe3
-rw-r--r--zziplib/zziplib_0.10.82.oe8
138 files changed, 577 insertions, 471 deletions
diff --git a/alsa-oss/alsa-oss-0.9.8/configure.patch b/adns/adns-1.0/fixparsedomainflags.patch
index e69de29bb2..e69de29bb2 100644
--- a/alsa-oss/alsa-oss-0.9.8/configure.patch
+++ b/adns/adns-1.0/fixparsedomainflags.patch
diff --git a/adns/adns_1.0.oe b/adns/adns_1.0.oe
index e6b2da2269..d541b23605 100644
--- a/adns/adns_1.0.oe
+++ b/adns/adns_1.0.oe
@@ -2,7 +2,8 @@ DEPENDS = "virtual/libc"
DESCRIPTION = "An advanced alternative, asynchronous resolver."
SRC_URI = "ftp://ftp.gnu.org/gnu/adns/adns-${PV}.tar.gz \
- file://${FILESDIR}/configure.patch;patch=1"
+ file://${FILESDIR}/configure.patch;patch=1 \
+ file://${FILESDIR}/fixparsedomainflags.patch;patch=1"
inherit autotools
@@ -15,8 +16,8 @@ do_configure_prepend () {
do_stage () {
install -m 0644 ${S}/src/adns.h ${STAGING_INCDIR}/
- install -m 0644 ${S}/src/libadns.a ${STAGING_LIBDIR}/
- oe_soinstall dynamic/libadns.so.1.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so -C dynamic libadns ${STAGING_LIBDIR}/
+ oe_libinstall -a -C src libadns ${STAGING_LIBDIR}/
}
do_install () {
diff --git a/alsa-lib/alsa-lib_0.9.8.oe b/alsa-lib/alsa-lib_0.9.8.oe
deleted file mode 100644
index 8b9f24cba3..0000000000
--- a/alsa-lib/alsa-lib_0.9.8.oe
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Alsa sound library"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
-LICENSE = "GPL"
-DEPENDS = "virtual/libc"
-FILES_alsa-lib_append = " ${datadir}/alsa"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2"
-
-inherit autotools libtool pkgconfig
-
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
-
-do_stage () {
- 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/m4.patch b/alsa-lib/alsa-lib_1.0.4.oe
index e69de29bb2..e69de29bb2 100644
--- a/alsa-oss/alsa-oss-0.9.8/m4.patch
+++ b/alsa-lib/alsa-lib_1.0.4.oe
diff --git a/alsa-utils/alsa-utils-0.9.8/autotools.patch b/alsa-oss/alsa-oss-1.0.4/configure.patch
index e69de29bb2..e69de29bb2 100644
--- a/alsa-utils/alsa-utils-0.9.8/autotools.patch
+++ b/alsa-oss/alsa-oss-1.0.4/configure.patch
diff --git a/alsa-utils/alsa-utils-0.9.8/m4.patch b/alsa-oss/alsa-oss-1.0.4/m4.patch
index e69de29bb2..e69de29bb2 100644
--- a/alsa-utils/alsa-utils-0.9.8/m4.patch
+++ b/alsa-oss/alsa-oss-1.0.4/m4.patch
diff --git a/alsa-oss/alsa-oss_0.9.8.oe b/alsa-oss/alsa-oss_0.9.8.oe
deleted file mode 100644
index b42575754d..0000000000
--- a/alsa-oss/alsa-oss_0.9.8.oe
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "Alsa OSS Compatibility Package"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
-LICENSE = "GPL"
-DEPENDS = "virtual/libc alsa-lib"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \
- file://${FILESDIR}/configure.patch;patch=1 \
- file://${FILESDIR}/m4.patch;patch=1"
-
-inherit autotools libtool
-
-do_configure_prepend () {
- touch NEWS README AUTHORS ChangeLog
-}
-
-do_stage () {
- 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/alsa-oss/alsa-oss_1.0.4.oe b/alsa-oss/alsa-oss_1.0.4.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/alsa-oss/alsa-oss_1.0.4.oe
diff --git a/alsa-utils/alsa-utils_0.9.8.oe b/alsa-utils/alsa-utils_0.9.8.oe
deleted file mode 100644
index 3f17d95325..0000000000
--- a/alsa-utils/alsa-utils_0.9.8.oe
+++ /dev/null
@@ -1,10 +0,0 @@
-DESCRIPTION = "Alsa Utilities"
-MAINTAINER = "Lorn Potter <lpotter@trolltech.com>"
-LICENSE = "GPL"
-DEPENDS = "virtual/libc"
-
-SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
- file://${FILESDIR}/autotools.patch;patch=1 \
- file://${FILESDIR}/m4.patch;patch=1"
-
-inherit autotools
diff --git a/alsa-utils/alsa-utils_1.0.4.oe b/alsa-utils/alsa-utils_1.0.4.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/alsa-utils/alsa-utils_1.0.4.oe
diff --git a/apmd/apmd_3.2.0.oe b/apmd/apmd_3.2.0.oe
index 3ea18fcbbc..9b0df16523 100644
--- a/apmd/apmd_3.2.0.oe
+++ b/apmd/apmd_3.2.0.oe
@@ -26,7 +26,7 @@ do_compile() {
}
do_stage() {
- oe_soinstall .libs/libapm.so.1.0.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so libapm ${STAGING_LIBDIR}
}
do_install() {
@@ -50,7 +50,7 @@ do_install() {
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}/
+ oe_libinstall -so libapm ${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
diff --git a/atk/atk_1.2.0.oe b/atk/atk_1.2.0.oe
index 7cee3c4dd5..9768d9e5c8 100644
--- a/atk/atk_1.2.0.oe
+++ b/atk/atk_1.2.0.oe
@@ -10,12 +10,10 @@ EXTRA_OECONF = "--disable-glibtest"
CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \
-I${STAGING_INCDIR}/glib-2.0/glib \
- -I${STAGING_INCDIR}/glib-2.0/gobject"
+ -I${STAGING_INCDIR}/glib-2.0/gobject"
do_stage () {
- 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}/
+ oe_libinstall -so -a -C atk libatk-1.0 ${STAGING_LIBDIR}
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/audiofile/audiofile_0.2.6.oe b/audiofile/audiofile_0.2.6.oe
index c81966e5ca..f18a421a40 100644
--- a/audiofile/audiofile_0.2.6.oe
+++ b/audiofile/audiofile_0.2.6.oe
@@ -13,9 +13,7 @@ inherit autotools libtool pkgconfig
do_stage () {
install -m 0644 libaudiofile/audiofile.h libaudiofile/aupvlist.h libaudiofile/af_vfs.h ${STAGING_INCDIR}/
- oe_soinstall libaudiofile/.libs/libaudiofile.so.0.0.2 ${STAGING_LIBDIR}/
- install -m 0644 libaudiofile/.libs/libaudiofile.a ${STAGING_LIBDIR}/libaudiofile.a
- install -m 0644 libaudiofile/.libs/libaudiofile.lai ${STAGING_LIBDIR}/libaudiofile.la
+ oe_libinstall -C libaudiofile libaudiofile ${STAGING_LIBDIR}
cat audiofile-config | sed -e "s,/usr/include,${STAGING_INCDIR},g; \
s,/usr/lib,${STAGING_LIBDIR},g; \
s,/usr/bin,${STAGING_BINDIR},g; \
diff --git a/bluez-libs/bluez-libs_2.4.oe b/bluez-libs/bluez-libs_2.4.oe
index cf1fa66d1b..bda4c084b2 100644
--- a/bluez-libs/bluez-libs_2.4.oe
+++ b/bluez-libs/bluez-libs_2.4.oe
@@ -10,9 +10,7 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
inherit autotools libtool
do_stage () {
- install -m 0644 src/.libs/libbluetooth.a ${STAGING_LIBDIR}/
- install -m 0644 src/.libs/libbluetooth.lai ${STAGING_LIBDIR}/libbluetooth.la
- oe_soinstall src/.libs/libbluetooth.so.1.0.2 ${STAGING_LIBDIR}/
+ oe_libinstall -a -so -C src libbluetooth ${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 \
diff --git a/bluez-sdp/bluez-sdp_1.5.oe b/bluez-sdp/bluez-sdp_1.5.oe
index f857632655..a5c9b9701b 100644
--- a/bluez-sdp/bluez-sdp_1.5.oe
+++ b/bluez-sdp/bluez-sdp_1.5.oe
@@ -13,9 +13,7 @@ LDFLAGS_prepend = "-L${S}/libs "
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
- oe_soinstall libs/.libs/libsdp.so.2.0.1 ${STAGING_LIBDIR}/
+ oe_libinstall -a -so -C libs libsdp ${STAGING_LIBDIR}
for X in sdp.h sdp_lib.h
do
diff --git a/bzip2/bzip2_1.0.2.oe b/bzip2/bzip2_1.0.2.oe
index db0c6e9652..8efb839d14 100644
--- a/bzip2/bzip2_1.0.2.oe
+++ b/bzip2/bzip2_1.0.2.oe
@@ -15,14 +15,11 @@ do_compile () {
}
do_stage () {
- install -m 0644 libbz2.a ${STAGING_LIBDIR}/
install -m 0644 bzlib.h ${STAGING_INCDIR}/
- oe_soinstall libbz2.so.1.0.2 ${STAGING_LIBDIR}/
+ oe_libinstall -a -so libbz2 ${STAGING_LIBDIR}
}
do_install () {
oe_runmake 'DESTDIR=${D}' install
- install -d ${D}/${libdir}
- oe_soinstall libbz2.so.1.0.2 ${D}/${libdir}/
- install -m 0644 libbz2.a ${D}/${libdir}/
+ oe_libinstall -a -so libbz2 ${D}/${libdir}
}
diff --git a/clucene/clucene_0.8.9.oe b/clucene/clucene_0.8.9.oe
index e69de29bb2..d2cf9c0237 100644
--- a/clucene/clucene_0.8.9.oe
+++ b/clucene/clucene_0.8.9.oe
@@ -0,0 +1,20 @@
+DESCRIPTION = "CLucene is a C++ port of Lucene: the high-performance, full-featured text search engine written in Java."
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "virtual/libc"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/clucene/clucene-${PV}-src.tar.gz"
+S = "${WORKDIR}/"
+
+inherit autotools libtool
+
+do_stage() {
+ oe_libinstall -C src libclucene ${STAGING_LIBDIR}
+ cd src
+ headers=`find CLucene -name "*.h"`
+ for f in $headers
+ do
+ install -d ${STAGING_INCDIR}/`dirname $f`
+ install -m 0644 $f ${STAGING_INCDIR}/$f
+ done
+}
diff --git a/curl/curl_7.10.8.oe b/curl/curl_7.10.8.oe
index d06208eaf2..6e02b39d58 100644
--- a/curl/curl_7.10.8.oe
+++ b/curl/curl_7.10.8.oe
@@ -12,9 +12,7 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
do_stage () {
install -d ${STAGING_INCDIR}/curl
install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
- oe_soinstall lib/.libs/libcurl.so.2.0.2 ${STAGING_LIBDIR}/
- install -m 0644 lib/.libs/libcurl.a ${STAGING_LIBDIR}/
- install -m 0644 lib/.libs/libcurl.lai ${STAGING_LIBDIR}/libcurl.la
+ oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
cat curl-config | sed -e "s,-I/usr/include,-I${STAGING_INCDIR}/," \
| sed -e "s,-L/usr/lib , , "> ${STAGING_BINDIR}/curl-config
diff --git a/curl/curl_7.11.0.oe b/curl/curl_7.11.0.oe
index 0bbd7a57b9..9b162a96bf 100644
--- a/curl/curl_7.11.0.oe
+++ b/curl/curl_7.11.0.oe
@@ -12,9 +12,7 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
do_stage () {
install -d ${STAGING_INCDIR}/curl
install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
- oe_soinstall lib/.libs/libcurl.so.2.0.2 ${STAGING_LIBDIR}/
- install -m 0644 lib/.libs/libcurl.a ${STAGING_LIBDIR}/
- install -m 0644 lib/.libs/libcurl.lai ${STAGING_LIBDIR}/libcurl.la
+ oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
cat curl-config | sed -e "s,-I/usr/include,-I${STAGING_INCDIR}/," \
| sed -e "s,-L/usr/lib , , "> ${STAGING_BINDIR}/curl-config
diff --git a/cyrus-sasl/cyrus-sasl_2.1.17.oe b/cyrus-sasl/cyrus-sasl_2.1.17.oe
index efb166e4a3..e0fa2ffe03 100644
--- a/cyrus-sasl/cyrus-sasl_2.1.17.oe
+++ b/cyrus-sasl/cyrus-sasl_2.1.17.oe
@@ -25,9 +25,7 @@ do_compile_prepend () {
}
do_stage () {
- install -m 0644 lib/.libs/libsasl2.lai ${STAGING_LIBDIR}/libsasl2.la
- install -m 0644 lib/.libs/libsasl2.a ${STAGING_LIBDIR}/libsasl2.a
- oe_soinstall lib/.libs/libsasl2.so.2.0.18 ${STAGING_LIBDIR}/
+ oe_libinstall -so -a -C lib libsasl2 ${STAGING_LIBDIR}
install -d ${STAGING_LIBDIR}/sasl
install -d ${STAGING_INCDIR}/sasl
install -m 0644 ${S}/include/hmac-md5.h ${STAGING_INCDIR}/sasl/
diff --git a/cyrus-sasl/cyrus-sasl_2.1.18.oe b/cyrus-sasl/cyrus-sasl_2.1.18.oe
index 3625e0e6f5..1bf653d224 100644
--- a/cyrus-sasl/cyrus-sasl_2.1.18.oe
+++ b/cyrus-sasl/cyrus-sasl_2.1.18.oe
@@ -24,9 +24,7 @@ do_compile_prepend () {
}
do_stage () {
- install -m 0644 lib/.libs/libsasl2.lai ${STAGING_LIBDIR}/libsasl2.la
- install -m 0644 lib/.libs/libsasl2.a ${STAGING_LIBDIR}/libsasl2.a
- oe_soinstall lib/.libs/libsasl2.so.2.0.18 ${STAGING_LIBDIR}/
+ oe_libinstall -so -a -C lib libsasl2 ${STAGING_LIBDIR}
install -d ${STAGING_LIBDIR}/sasl
install -d ${STAGING_INCDIR}/sasl
install -m 0644 ${S}/include/hmac-md5.h ${STAGING_INCDIR}/sasl/
diff --git a/dbus/dbus_0.20.oe b/dbus/dbus_0.20.oe
index 8bf7a28d30..a40122b4af 100644
--- a/dbus/dbus_0.20.oe
+++ b/dbus/dbus_0.20.oe
@@ -13,15 +13,9 @@ EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \
headers = "dbus-address.h dbus-bus.h dbus-connection.h dbus-errors.h dbus-macros.h dbus-memory.h dbus-message.h dbus-pending-call.h dbus-protocol.h dbus-server.h dbus-threads.h dbus-types.h dbus.h"
-libname = "libdbus-1.so.0.0.0"
-glibname = "libdbus-glib-1.so.0.0.0"
-
do_stage () {
- oe_soinstall dbus/.libs/${libname} ${STAGING_LIBDIR}/
- install -m 0644 dbus/libdbus-1.la ${STAGING_LIBDIR}/
-
- oe_soinstall glib/.libs/${glibname} ${STAGING_LIBDIR}/
- install -m 0644 glib/libdbus-glib-1.la ${STAGING_LIBDIR}/
+ oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
+ oe_libinstall -so -C glib libdbus-glib-1 ${STAGING_LIBDIR}
mkdir -p ${STAGING_INCDIR}/dbus-1.0/dbus
for i in ${headers}; do
diff --git a/dbus/dbus_0.21.oe b/dbus/dbus_0.21.oe
index 8bf7a28d30..a40122b4af 100644
--- a/dbus/dbus_0.21.oe
+++ b/dbus/dbus_0.21.oe
@@ -13,15 +13,9 @@ EXTRA_OECONF = "--disable-qt --disable-gtk --disable-tests \
headers = "dbus-address.h dbus-bus.h dbus-connection.h dbus-errors.h dbus-macros.h dbus-memory.h dbus-message.h dbus-pending-call.h dbus-protocol.h dbus-server.h dbus-threads.h dbus-types.h dbus.h"
-libname = "libdbus-1.so.0.0.0"
-glibname = "libdbus-glib-1.so.0.0.0"
-
do_stage () {
- oe_soinstall dbus/.libs/${libname} ${STAGING_LIBDIR}/
- install -m 0644 dbus/libdbus-1.la ${STAGING_LIBDIR}/
-
- oe_soinstall glib/.libs/${glibname} ${STAGING_LIBDIR}/
- install -m 0644 glib/libdbus-glib-1.la ${STAGING_LIBDIR}/
+ oe_libinstall -so -C dbus libdbus-1 ${STAGING_LIBDIR}
+ oe_libinstall -so -C glib libdbus-glib-1 ${STAGING_LIBDIR}
mkdir -p ${STAGING_INCDIR}/dbus-1.0/dbus
for i in ${headers}; do
diff --git a/esound/esound-gpe_cvs.oe b/esound/esound-gpe_cvs.oe
index e69de29bb2..313e80350c 100644
--- a/esound/esound-gpe_cvs.oe
+++ b/esound/esound-gpe_cvs.oe
@@ -0,0 +1,9 @@
+SRC_URI = "cvs://anoncvs@cvs.handhelds.org/cvs;module=gpe/base/esound"
+S = "${WORKDIR}/esound"
+
+inherit autotools libtool
+
+do_stage () {
+ install -m 0644 esd.h ${STAGING_INCDIR}/esd.h
+ oe_libinstall -so libesd ${STAGING_LIBDIR}
+}
diff --git a/expat/expat_1.95.6.oe b/expat/expat_1.95.6.oe
index 9562239fe1..ae13e5da14 100644
--- a/expat/expat_1.95.6.oe
+++ b/expat/expat_1.95.6.oe
@@ -9,7 +9,7 @@ export LTCC = "${CC}"
do_stage () {
install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
- oe_soinstall .libs/libexpat.so.0.4.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so libexpat ${STAGING_LIBDIR}/
}
do_install () {
diff --git a/expat/expat_1.95.7.oe b/expat/expat_1.95.7.oe
index 546d151d86..b3e8125ca7 100644
--- a/expat/expat_1.95.7.oe
+++ b/expat/expat_1.95.7.oe
@@ -9,7 +9,7 @@ export LTCC = "${CC}"
do_stage () {
install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
- oe_soinstall .libs/libexpat.so.0.5.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so libexpat ${STAGING_LIBDIR}
}
do_install () {
diff --git a/fakeroot/fakeroot-native_0.9.0.oe b/fakeroot/fakeroot-native_0.9.0.oe
index a1b91282ef..256f8212b2 100644
--- a/fakeroot/fakeroot-native_0.9.0.oe
+++ b/fakeroot/fakeroot-native_0.9.0.oe
@@ -6,6 +6,5 @@ S = ${WORKDIR}/fakeroot-${PV}
EXTRA_OECONF = "--program-prefix= "
do_stage_append () {
- install -d ${STAGING_LIBDIR}/libfakeroot
- oe_soinstall ${S}/.libs/libfakeroot.so.0.0.1 ${STAGING_LIBDIR}/libfakeroot
+ oe_libinstall -so libfakeroot ${STAGING_LIBDIR}/libfakeroot/
}
diff --git a/fam/fam_2.6.10.oe b/fam/fam_2.6.10.oe
index 203181cc28..3dbcfd43c3 100644
--- a/fam/fam_2.6.10.oe
+++ b/fam/fam_2.6.10.oe
@@ -11,9 +11,7 @@ inherit autotools libtool
CPPFLAGS_append = " -DNDEBUG"
do_stage() {
- oe_soinstall libfam/.libs/libfam.so.0.0.0 ${STAGING_LIBDIR}/
- install -m 0644 libfam/.libs/libfam.a ${STAGING_LIBDIR}/libfam.a
- install -m 0644 libfam/.libs/libfam.lai ${STAGING_LIBDIR}/libfam.la
+ oe_libinstall -so -a -C libfam libfam ${STAGING_LIBDIR}/
install -m 0644 ${S}/include/fam.h ${STAGING_INCDIR}/
}
diff --git a/fam/fam_2.7.0.oe b/fam/fam_2.7.0.oe
index fcc4860fe9..74f7899306 100644
--- a/fam/fam_2.7.0.oe
+++ b/fam/fam_2.7.0.oe
@@ -11,9 +11,7 @@ inherit autotools libtool
CPPFLAGS_append = " -DNDEBUG"
do_stage() {
- oe_soinstall libfam/.libs/libfam.so.0.0.0 ${STAGING_LIBDIR}/
- install -m 0644 libfam/.libs/libfam.a ${STAGING_LIBDIR}/libfam.a
- install -m 0644 libfam/.libs/libfam.lai ${STAGING_LIBDIR}/libfam.la
+ oe_libinstall -so -a -C libfam libfam ${STAGING_LIBDIR}/
install -m 0644 ${S}/include/fam.h ${STAGING_INCDIR}/
}
diff --git a/flexis-zaurus/flexis-zaurus_1.0.0.oe b/flexis-zaurus/flexis-zaurus_1.0.0.oe
index e69de29bb2..35f80a717b 100644
--- a/flexis-zaurus/flexis-zaurus_1.0.0.oe
+++ b/flexis-zaurus/flexis-zaurus_1.0.0.oe
@@ -0,0 +1,18 @@
+DESCRIPTION = "A Qtopia/Opie Input Method plugin for the Flexis FX100 Keyboard."
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "virtual/libc"
+
+SRC_URI = "http://www.Vanille.de/mirror/flexis-zaurus-${PV}.tar.bz2 \
+ file://${FILESDIR}/gcc3.patch;patch=1"
+S = "${WORKDIR}/flexis-zaurus"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST = "CONFIG-=qtopia"
+
+do_install() {
+ oe_libinstall libqflexis ${D}/${palmtopdir}/plugins/inputmethods/
+}
diff --git a/fontconfig/fontconfig_2.2.92.oe b/fontconfig/fontconfig_2.2.92.oe
index 2ea4771eb7..495b2a1cc6 100644
--- a/fontconfig/fontconfig_2.2.92.oe
+++ b/fontconfig/fontconfig_2.2.92.oe
@@ -31,10 +31,7 @@ do_compile () {
do_stage () {
- oe_soinstall src/.libs/libfontconfig.so.1.0.4 ${STAGING_LIBDIR}/
- install -m 0644 src/.libs/libfontconfig.a ${STAGING_LIBDIR}/
- install -m 0644 src/.libs/libfontconfig.lai ${STAGING_LIBDIR}/libfontconfig.la
+ oe_libinstall -so -a -C src libfontconfig ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/fontconfig
cp -a ${S}/fontconfig/*.h ${STAGING_INCDIR}/fontconfig/
}
-
diff --git a/freetype/freetype-native_2.1.7.oe b/freetype/freetype-native_2.1.7.oe
index 1f15d700c3..2fb5816eca 100644
--- a/freetype/freetype-native_2.1.7.oe
+++ b/freetype/freetype-native_2.1.7.oe
@@ -14,10 +14,7 @@ do_configure () {
}
do_stage () {
- oe_soinstall objs/.libs/libfreetype.so.6.3.5 ${STAGING_LIBDIR}/
-
- install -m 0644 objs/.libs/libfreetype.lai ${STAGING_LIBDIR}/libfreetype.la
- install -m 0644 objs/.libs/libfreetype.a ${STAGING_LIBDIR}/libfreetype.a
+ oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
cp -a ${S}/include/*.h ${STAGING_INCDIR}
install -d ${STAGING_INCDIR}/freetype2
cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/
diff --git a/freetype/freetype_2.1.7.oe b/freetype/freetype_2.1.7.oe
index 1207d514ea..c002dff23c 100644
--- a/freetype/freetype_2.1.7.oe
+++ b/freetype/freetype_2.1.7.oe
@@ -18,10 +18,8 @@ do_configure () {
}
do_stage () {
- oe_soinstall objs/.libs/libfreetype.so.6.3.5 ${STAGING_LIBDIR}/
+ oe_libinstall -so -a -C objs libfreetype ${STAGING_LIBDIR}
- install -m 0644 objs/.libs/libfreetype.lai ${STAGING_LIBDIR}/libfreetype.la
- install -m 0644 objs/.libs/libfreetype.a ${STAGING_LIBDIR}/
cp -a ${S}/include/*.h ${STAGING_INCDIR}
install -d ${STAGING_INCDIR}/freetype2
cp -a ${S}/include/freetype ${STAGING_INCDIR}/freetype2/
diff --git a/gdbm/gdbm_1.8.3.oe b/gdbm/gdbm_1.8.3.oe
index 98956cddd5..8a1e043e70 100644
--- a/gdbm/gdbm_1.8.3.oe
+++ b/gdbm/gdbm_1.8.3.oe
@@ -10,8 +10,6 @@ SRC_URI = "${GNU_MIRROR}/gdbm/gdbm-${PV}.tar.gz \
inherit autotools libtool
do_stage () {
- oe_soinstall .libs/libgdbm.so.3.0.0 ${STAGING_LIBDIR}/
- install -m 0644 .libs/libgdbm.a ${STAGING_LIBDIR}/
- install -m 0644 .libs/libgdbm.lai ${STAGING_LIBDIR}/libgdbm.la
+ oe_libinstall -so -a libgdbm ${STAGING_LIBDIR}
install -m 0644 ${S}/gdbm.h ${STAGING_INCDIR}/
}
diff --git a/glib-2.0/glib-2.0-native_2.2.3.oe b/glib-2.0/glib-2.0-native_2.2.3.oe
index 6993a712d1..e3a38ad5f2 100644
--- a/glib-2.0/glib-2.0-native_2.2.3.oe
+++ b/glib-2.0/glib-2.0-native_2.2.3.oe
@@ -12,23 +12,13 @@ do_configure_prepend () {
install -m 0644 ${FILESDIR}/glibconfig-sysdefs.h .
}
-SOV = "0.200.3"
-
do_stage () {
install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
install -m 0755 gobject/glib-genmarshal ${STAGING_BINDIR}/
- oe_soinstall glib/.libs/libglib-2.0.so.${SOV} ${STAGING_LIBDIR}/
- oe_soinstall gmodule/.libs/libgmodule-2.0.so.${SOV} ${STAGING_LIBDIR}/
- oe_soinstall gthread/.libs/libgthread-2.0.so.${SOV} ${STAGING_LIBDIR}/
- oe_soinstall gobject/.libs/libgobject-2.0.so.${SOV} ${STAGING_LIBDIR}/
- install -m 0644 glib/.libs/libglib-2.0.lai ${STAGING_LIBDIR}/libglib-2.0.la
- install -m 0644 glib/.libs/libglib-2.0.a ${STAGING_LIBDIR}/libglib-2.0.a
- install -m 0644 gmodule/.libs/libgmodule-2.0.lai ${STAGING_LIBDIR}/libgmodule-2.0.la
- install -m 0644 gmodule/.libs/libgmodule-2.0.a ${STAGING_LIBDIR}/libgmodule-2.0.a
- install -m 0644 gthread/.libs/libgthread-2.0.lai ${STAGING_LIBDIR}/libgthread-2.0.la
- install -m 0644 gthread/.libs/libgthread-2.0.a ${STAGING_LIBDIR}/libgthread-2.0.a
- install -m 0644 gobject/.libs/libgobject-2.0.lai ${STAGING_LIBDIR}/libgobject-2.0.la
- install -m 0644 gobject/.libs/libgobject-2.0.a ${STAGING_LIBDIR}/libgobject-2.0.a
+ oe_libinstall -so -a -C glib libglib-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -a -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -a -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -a -C gobject libgobject-2.0 ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/glib-2.0/glib
install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
install -m 0644 ${S}/glib/glib-object.h ${STAGING_INCDIR}/glib-2.0/glib-object.h
diff --git a/glib-2.0/glib-2.0_2.2.3.oe b/glib-2.0/glib-2.0_2.2.3.oe
index 3f50f8cee7..99a9feeb24 100644
--- a/glib-2.0/glib-2.0_2.2.3.oe
+++ b/glib-2.0/glib-2.0_2.2.3.oe
@@ -20,20 +20,11 @@ do_configure_prepend () {
install -m 0644 ${FILESDIR}/glibconfig-sysdefs.h .
}
-SOV = "0.200.3"
do_stage () {
- oe_soinstall glib/.libs/libglib-2.0.so.${SOV} ${STAGING_LIBDIR}/
- oe_soinstall gmodule/.libs/libgmodule-2.0.so.${SOV} ${STAGING_LIBDIR}/
- oe_soinstall gthread/.libs/libgthread-2.0.so.${SOV} ${STAGING_LIBDIR}/
- oe_soinstall gobject/.libs/libgobject-2.0.so.${SOV} ${STAGING_LIBDIR}/
- install -m 0644 glib/.libs/libglib-2.0.lai ${STAGING_LIBDIR}/libglib-2.0.la
- #install -m 0644 glib/.libs/libglib-2.0.a ${STAGING_LIBDIR}/libglib-2.0.a
- install -m 0644 gmodule/.libs/libgmodule-2.0.lai ${STAGING_LIBDIR}/libgmodule-2.0.la
- #install -m 0644 gmodule/.libs/libgmodule-2.0.a ${STAGING_LIBDIR}/libgmodule-2.0.a
- install -m 0644 gthread/.libs/libgthread-2.0.lai ${STAGING_LIBDIR}/libgthread-2.0.la
- #install -m 0644 gthread/.libs/libgthread-2.0.a ${STAGING_LIBDIR}/libgthread-2.0.a
- install -m 0644 gobject/.libs/libgobject-2.0.lai ${STAGING_LIBDIR}/libgobject-2.0.la
- #install -m 0644 gobject/.libs/libgobject-2.0.a ${STAGING_LIBDIR}/libgobject-2.0.a
+ oe_libinstall -so -a -C glib libglib-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -a -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -a -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -a -C gobject libgobject-2.0 ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/glib-2.0/glib
install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
install -m 0644 ${S}/glib/glib-object.h ${STAGING_INCDIR}/glib-2.0/glib-object.h
diff --git a/gmp/gmp_4.1.2.oe b/gmp/gmp_4.1.2.oe
index 9c76cbbe87..efca7421bb 100644
--- a/gmp/gmp_4.1.2.oe
+++ b/gmp/gmp_4.1.2.oe
@@ -9,7 +9,6 @@ inherit autotools libtool
acpaths = ""
do_stage () {
- install -m 0644 .libs/libgmp.lai ${STAGING_LIBDIR}/libgmp.la
- oe_soinstall .libs/libgmp.so.3.3.2 ${STAGING_LIBDIR}
+ oe_libinstall -so libgmp ${STAGING_LIBDIR}
install -m 0644 ${S}/gmp.h ${STAGING_INCDIR}/gmp.h
}
diff --git a/gpm/gpm_1.20.1.oe b/gpm/gpm_1.20.1.oe
index 0d7bde44c6..aad2a7a110 100644
--- a/gpm/gpm_1.20.1.oe
+++ b/gpm/gpm_1.20.1.oe
@@ -16,8 +16,7 @@ do_configure_prepend () {
do_stage () {
install -m 0644 src/headers/gpm.h ${STAGING_INCDIR}/
- install -m 0644 src/lib/libgpm.a ${STAGING_LIBDIR}/
- oe_soinstall src/lib/libgpm.so.1.19.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so -a -C src/lib libgpm ${STAGING_LIBDIR}
}
do_install () {
diff --git a/gsl/gsl_1.4.oe b/gsl/gsl_1.4.oe
index 783371d837..9af8422688 100644
--- a/gsl/gsl_1.4.oe
+++ b/gsl/gsl_1.4.oe
@@ -10,8 +10,8 @@ inherit autotools libtool pkgconfig
do_stage() {
oe_runmake DESTDIR=${S}/.install install
- oe_soinstall .install/usr/lib/libgslcblas.so.0.0.0 ${STAGING_LIBDIR}/
- oe_soinstall .install/usr/lib/libgsl.so.0.5.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so -C .install/usr/lib libgslcblas ${STAGING_LIBDIR}
+ oe_libinstall -so -C .install/usr/lib libgsl ${STAGING_LIBDIR}
cp -a .install/usr/include/* ${STAGING_INCDIR}/
cat gsl-config | sed -e "s,-I/usr/include,-I${STAGING_INCDIR} -I${STAGING_INCDIR}/python2.3," \
diff --git a/gtk+/gtk+_2.2.4.oe b/gtk+/gtk+_2.2.4.oe
index 2a5b74b76f..349f170dd5 100644
--- a/gtk+/gtk+_2.2.4.oe
+++ b/gtk+/gtk+_2.2.4.oe
@@ -24,7 +24,6 @@ do_configure_prepend() {
EXTRA_OECONF = "--without-libtiff --enable-debug=no --disable-cruft"
-SOV = "0.200.4"
LIBV = "2.2.0"
gtk_include = "gtk.h gtkaccelgroup.h gtkaccellabel.h gtkaccelmap.h gtkaccessible.h gtkadjustment.h gtkalignment.h gtkarrow.h gtkaspectframe.h gtkbbox.h gtkbin.h gtkbindings.h gtkbox.h gtkbutton.h gtkcalendar.h gtkcelleditable.h gtkcellrenderer.h gtkcellrendererpixbuf.h gtkcellrenderertext.h gtkcellrenderertoggle.h gtkcheckbutton.h gtkcheckmenuitem.h gtkclipboard.h gtkclist.h gtkcolorsel.h gtkcolorseldialog.h gtkcombo.h gtkcontainer.h gtkctree.h gtkcurve.h gtkdebug.h gtkdialog.h gtkdnd.h gtkdrawingarea.h gtkeditable.h gtkentry.h gtkenums.h gtkeventbox.h gtkfilesel.h gtkfixed.h gtkfontsel.h gtkframe.h gtkgamma.h gtkgc.h gtkhandlebox.h gtkhbbox.h gtkhbox.h gtkhpaned.h gtkhruler.h gtkhscale.h gtkhscrollbar.h gtkhseparator.h gtkiconfactory.h gtkimage.h gtkimagemenuitem.h gtkimcontext.h gtkimcontextsimple.h gtkimmodule.h gtkimmulticontext.h gtkinputdialog.h gtkinvisible.h gtkitem.h gtkitemfactory.h gtklabel.h gtklayout.h gtklist.h gtklistitem.h gtkliststore.h gtkmain.h gtkmarshal.h gtkmenu.h gtkmenubar.h gtkmenuitem.h gtkmenushell.h gtkmessagedialog.h gtkmisc.h gtknotebook.h gtkobject.h gtkoldeditable.h gtkoptionmenu.h gtkpaned.h gtkpixmap.h gtkplug.h gtkpreview.h gtkprivate.h gtkprogress.h gtkprogressbar.h gtkradiobutton.h gtkradiomenuitem.h gtkrange.h gtkrc.h gtkruler.h gtkscale.h gtkscrollbar.h gtkscrolledwindow.h gtkselection.h gtkseparator.h gtkseparatormenuitem.h gtksettings.h gtksignal.h gtksizegroup.h gtksocket.h gtkspinbutton.h gtkstatusbar.h gtkstock.h gtkstyle.h gtktable.h gtktearoffmenuitem.h gtktext.h gtktextbuffer.h gtktextchild.h gtktextdisplay.h gtktextiter.h gtktextlayout.h gtktextmark.h gtktexttag.h gtktexttagtable.h gtktextview.h gtktipsquery.h gtktogglebutton.h gtktoolbar.h gtktooltips.h gtktree.h gtktreednd.h gtktreeitem.h gtktreemodel.h gtktreemodelsort.h gtktreeselection.h gtktreesortable.h gtktreestore.h gtktreeview.h gtktreeviewcolumn.h gtktypebuiltins.h gtktypeutils.h gtkvbbox.h gtkvbox.h gtkversion.h gtkviewport.h gtkvpaned.h gtkvruler.h gtkvscale.h gtkvscrollbar.h gtkvseparator.h gtkwidget.h gtkwindow.h"
@@ -32,21 +31,10 @@ gdk_include = "gdk.h gdkcolor.h gdkcursor.h gdkdisplay.h gdkdisplaymanager.h gdk
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 () {
- 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
-
- 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
-
- oe_soinstall contrib/gdk-pixbuf-xlib/.libs/libgdk_pixbuf_xlib-2.0.so.${SOV} ${STAGING_LIBDIR}/
- install -m 0644 contrib/gdk-pixbuf-xlib/.libs/libgdk_pixbuf_xlib-2.0.lai ${STAGING_LIBDIR}/
- install -m 0644 contrib/gdk-pixbuf-xlib/.libs/libgdk_pixbuf_xlib-2.0.a ${STAGING_LIBDIR}/
-
- oe_soinstall gdk-pixbuf/.libs/libgdk_pixbuf-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
+ oe_libinstall -a -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
mkdir -p ${STAGING_INCDIR}/gtk-2.0/gtk
for i in ${gtk_include}; do
diff --git a/ipkg/ipkg_0.99.121.oe b/ipkg/ipkg_0.99.121.oe
index 0c271c4ddb..de288e59b2 100644
--- a/ipkg/ipkg_0.99.121.oe
+++ b/ipkg/ipkg_0.99.121.oe
@@ -33,7 +33,7 @@ update-alternatives --remove ipkg /usr/bin/ipkg-cl
}
do_stage() {
- oe_soinstall .libs/libipkg.so.0.0.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so libipkg ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/replace/
install -m 0644 replace/replace.h ${STAGING_INCDIR}/replace/
install -d ${STAGING_INCDIR}/libipkg/
diff --git a/irk/irk_0.11.0.oe b/irk/irk_0.11.0.oe
index e62b38bb4e..cad2d02e10 100644
--- a/irk/irk_0.11.0.oe
+++ b/irk/irk_0.11.0.oe
@@ -19,7 +19,7 @@ do_install() {
install chicony.conf ${D}/${sysconfdir}/lircd.conf
install IRK.conf ${D}/${sysconfdir}
- oe_soinstall libirk.so.1.0.0 ${D}${palmtopdir}/plugins/inputmethods/
+ oe_libinstall -so libirk ${D}/${palmtopdir}/plugins/inputmethods
}
FILES_irk_append=" /etc /home/root"
diff --git a/jpeg/jpeg_6b.oe b/jpeg/jpeg_6b.oe
index 4e2a5347b4..acebca58b8 100644
--- a/jpeg/jpeg_6b.oe
+++ b/jpeg/jpeg_6b.oe
@@ -28,7 +28,7 @@ do_stage() {
install -m 644 jmorecfg.h ${STAGING_INCDIR}/jmorecfg.h
install -m 644 jerror.h ${STAGING_INCDIR}/jerror.h
install -m 644 jpegint.h ${STAGING_INCDIR}/jpegint.h
- oe_soinstall .libs/libjpeg.so.62.0.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so libjpeg ${STAGING_LIBDIR}
}
do_install() {
diff --git a/klimt/klimt_0.6.1.oe b/klimt/klimt_0.6.1.oe
index 89e27814d9..c10f563be2 100644
--- a/klimt/klimt_0.6.1.oe
+++ b/klimt/klimt_0.6.1.oe
@@ -18,6 +18,5 @@ do_stage() {
}
do_install() {
- install -d ${D}${palmtopdir}/lib
- oe_soinstall ${STAGING_LIBDIR}/libKlimt.so.0.5.1 ${D}${palmtopdir}/lib/
+ oe_libinstall -so -C ${STAGING_LIBDIR} libKlimt ${D}/${palmtopdir}/lib
}
diff --git a/korganizer/korganizer-embedded_1.5.0.oe b/korganizer/korganizer-embedded_1.5.0.oe
index ff81c311dc..586fa79e5b 100644
--- a/korganizer/korganizer-embedded_1.5.0.oe
+++ b/korganizer/korganizer-embedded_1.5.0.oe
@@ -29,15 +29,14 @@ do_install() {
${D}/${palmtopdir}/lib \
${D}/${palmtopdir}/apps/Pim \
${D}/${palmtopdir}/pics/korganizer/icons16
- install -m 0644 korganizer/korganizer.desktop ${D}/opt/QtPalmtop/apps/Pim/korganizer.desktop
+ install -m 0644 korganizer/korganizer.desktop ${D}/${palmtopdir}/apps/Pim/korganizer.desktop
cd ${S}/pics
- cp *.png *.wav ${D}/opt/QtPalmtop/pics/korganizer
- cp ./icons16/*.png ${D}/opt/QtPalmtop/pics/korganizer/icons16
- for f in libmicrokde.so.1.0.0 libkcal.so.1.0.0 libkdepim.so.1.0.0 libqtcompat.so.1.0.0
+ cp *.png *.wav ${D}/${palmtopdir}/pics/korganizer
+ cp ./icons16/*.png ${D}/${palmtopdir}/pics/korganizer/icons16
+ for f in libmicrokde libkcal libkdepim libqtcompat
do
- oe_soinstall ${STAGING_LIBDIR}/${f} ${D}/opt/QtPalmtop/lib
- rm -f ${STAGING_LIBDIR}/${f}
+ oe_libinstall -so -C ${STAGING_LIBDIR} $f ${D}/${palmtopdir}/lib
done
- install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/korganizer ${D}/opt/QtPalmtop/bin/korganizer
+ install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/korganizer ${D}/${palmtopdir}/bin/korganizer
rm -f ${STAGING_DIR}/${HOST_SYS}/bin/korganizer
}
diff --git a/korganizer/korganizer-embedded_1.7.0.oe b/korganizer/korganizer-embedded_1.7.0.oe
index e1f9852bf3..79f8e8c1ce 100644
--- a/korganizer/korganizer-embedded_1.7.0.oe
+++ b/korganizer/korganizer-embedded_1.7.0.oe
@@ -33,23 +33,22 @@ do_install() {
${D}/${palmtopdir}/pics/korganizer/icons16 \
${D}/${palmtopdir}/pics/korganizer/iconsmini \
${D}/${palmtopdir}/plugins/applets
- install -m 0644 korganizer/korganizer.desktop ${D}/opt/QtPalmtop/apps/Pim/korganizer.desktop
+ install -m 0644 korganizer/korganizer.desktop ${D}/${palmtopdir}/apps/Pim/korganizer.desktop
cd ${S}/pics
- cp ko*.png ${D}/opt/QtPalmtop/pics
- cp *.png *.wav ${D}/opt/QtPalmtop/pics/korganizer
- cp ./icons16/*.png ${D}/opt/QtPalmtop/pics/korganizer/icons16
- cp ./iconsmini/*.png ${D}/opt/QtPalmtop/pics/korganizer/iconsmini
-
- for f in libmicrokde.so.1.0.0 libmicrokdepim.so.1.0.0 libmicrokabc.so.1.0.0 libmicrokcal.so.1.0.0 libmicroqtcompat.so.1.0.0
- do
- oe_soinstall ${STAGING_LIBDIR}/${f} ${D}/opt/QtPalmtop/lib
- done
+ cp ko*.png ${D}/${palmtopdir}/pics
+ cp *.png *.wav ${D}/${palmtopdir}/pics/korganizer
+ cp ./icons16/*.png ${D}/${palmtopdir}/pics/korganizer/icons16
+ cp ./iconsmini/*.png ${D}/${palmtopdir}/pics/korganizer/iconsmini
- install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/kopi ${D}/opt/QtPalmtop/bin/kopi
-
- for f in libkopialarmapplet.so.1.0.0
+ for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
do
- oe_soinstall ${STAGING_DIR}/${HOST_SYS}/plugins/applets/${f} ${D}/opt/QtPalmtop/plugins/applets
+ oe_libinstall -so -C ${STAGING_LIBDIR} $f ${D}/${palmtopdir}/lib
done
+ install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/kopi ${D}/${palmtopdir}/bin/kopi
+
+ for f in libkopialarmapplet
+ do
+ oe_libinstall -so -C ${STAGING_DIR}/${HOST_SYS}/plugins/applets $f ${d}/${palmtopdir}/plugins/applets
+ done
}
diff --git a/korganizer/korganizer-embedded_1.7.5.oe b/korganizer/korganizer-embedded_1.7.5.oe
index e69de29bb2..90be6abd08 100644
--- a/korganizer/korganizer-embedded_1.7.5.oe
+++ b/korganizer/korganizer-embedded_1.7.5.oe
@@ -0,0 +1,53 @@
+DESCRIPTION= "Korganizer/Pi is a powerful calender and ToDo Tool for Qt/Embedded based Palmtop Environments"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Sebastian Goergen <zeppo@gmx.net>"
+LICENSE = "GPL"
+RDEPENDS = "lipqpe1"
+DEPENDS ="virtual/libc virtual/libqpe libopie1"
+
+SRC_URI = "http://www.pi-sync.net/daunlood/stable/korganizerPi.175.tar.gz"
+
+S = "${WORKDIR}/korganizerPi.175"
+
+inherit palmtop
+
+EXTRA_QMAKEVARS_POST = "QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BINDIR}/moc QMAKE_RPATH=-Wl,-rpath-link,"
+QMAKE_PROFILES= "all.pro"
+
+SUBDIRS="microkde libical/src/libical libical/src/libicalss libkcal libkdepim libkabcwrap kalarmd korganizer"
+
+do_configure_prepend() {
+ echo -e "TEMPLATE=subdirs\nSUBDIRS=qtcompat ${SUBDIRS}\n" >all.pro
+ for d in ${SUBDIRS}
+ do
+ mv -f ${d}/`basename ${d}`E.pro ${d}/`basename ${d}`.pro
+ done
+}
+
+do_install() {
+ install -d ${D}/${palmtopdir}/bin \
+ ${D}/${palmtopdir}/lib \
+ ${D}/${palmtopdir}/apps/1Pim \
+ ${D}/${palmtopdir}/pics/korganizer/icons16 \
+ ${D}/${palmtopdir}/pics/korganizer/iconsmini \
+ ${D}/${palmtopdir}/plugins/applets
+ install -m 0644 korganizer/korganizer.desktop ${D}/${palmtopdir}/apps/1Pim/korganizer.desktop
+ cd ${S}/pics
+ install -m 0644 ${S}/pics/ko*.png ${D}/${palmtopdir}/pics
+ install -m 0644 ${S}/pics/*.png ${D}/${palmtopdir}/pics/korganizer
+ install -m 0644 ${S}/pics/icons16/*.png ${D}/${palmtopdir}/pics/korganizer/icons16
+ install -m 0644 ${S}/pics/iconsmini/*.png ${D}/${palmtopdir}/pics/korganizer/iconsmini
+
+ for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
+ do
+ oe_libinstall -so -C ${STAGING_LIBDIR} $f ${d}/${palmtopdir}/lib
+ done
+
+ install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/kopi ${D}/${palmtopdir}/bin/kopi
+
+ for f in libkopialarmapplet
+ do
+ oe_libinstall -so -C ${STAGING_DIR}/${HOST_SYS}/plugins/applets $f ${d}/${palmtopdir}/plugins/applets
+ done
+}
diff --git a/libao/libao_0.8.4.oe b/libao/libao_0.8.4.oe
index d75648d619..c0ffa05e91 100644
--- a/libao/libao_0.8.4.oe
+++ b/libao/libao_0.8.4.oe
@@ -17,7 +17,5 @@ do_stage () {
install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \
${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/
- install -m 0644 src/.libs/libao.a ${STAGING_LIBDIR}/
- install -m 0644 src/.libs/libao.lai ${STAGING_LIBDIR}/libao.la
- oe_soinstall src/.libs/libao.so.2.1.2 ${STAGING_LIBDIR}/
+ oe_libinstall -a -so -C src libao ${STAGING_LIBDIR}
}
diff --git a/libdaemon/libdaemon_0.3.oe b/libdaemon/libdaemon_0.3.oe
index 55f07ffd44..a579ec1865 100644
--- a/libdaemon/libdaemon_0.3.oe
+++ b/libdaemon/libdaemon_0.3.oe
@@ -8,9 +8,7 @@ inherit autotools libtool
EXTRA_OECONF = "--disable-lynx"
do_stage () {
- oe_soinstall src/.libs/libdaemon.so.0.1.0 ${STAGING_LIBDIR}/
- install -m 0644 src/.libs/libdaemon.a ${STAGING_LIBDIR}/
- install -m 0644 src/.libs/libdaemon.lai ${STAGING_LIBDIR}/libdaemon.la
+ oe_libinstall -a -so -C src libdaemon ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/libdaemon
for i in dlog.h dfork.h dsignal.h dnonblock.h dpid.h; do
install -m 0644 ${S}/src/$i ${STAGING_INCDIR}/libdaemon/
diff --git a/libdisplaymigration/libdisplaymigration_0.28.oe b/libdisplaymigration/libdisplaymigration_0.28.oe
index ab9d840cdc..59ad9562a9 100644
--- a/libdisplaymigration/libdisplaymigration_0.28.oe
+++ b/libdisplaymigration/libdisplaymigration_0.28.oe
@@ -11,7 +11,7 @@ SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libdisplaymigration-
headers = "displaymigration.h auth.h crypt.h"
do_stage () {
- oe_soinstall libdisplaymigration.so.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so libdisplaymigration ${STAGING_LIBDIR}
mkdir -p ${STAGING_INCDIR}/libdisplaymigration
for h in ${headers}; do
diff --git a/libdotdesktop/libdotdesktop_0.11.oe b/libdotdesktop/libdotdesktop_0.11.oe
index e69de29bb2..62ff1e7a05 100644
--- a/libdotdesktop/libdotdesktop_0.11.oe
+++ b/libdotdesktop/libdotdesktop_0.11.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "library for extracting mime data from .desktop files."
+DEPENDS = "glib-2.0"
+
+inherit pkgconfig
+
+SRC_URI = "ftp://gpe.handhelds.org/gpe/source/libdotdesktop-${PV}.tar.gz \
+ file://${FILESDIR}/make_build_var.patch;patch=1"
+
+headers = "dotdesktop.h"
+
+do_stage () {
+ oe_libinstall -so libdotdesktop ${STAGING_LIBDIR}
+ mkdir -p ${STAGING_INCDIR}/gpe
+ for h in ${headers}; do
+ install -m 0644 ${S}/$h ${STAGING_INCDIR}/gpe/$h
+ done
+}
+
+do_install () {
+ oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program
+ oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel
+}
+
diff --git a/libesmtp/libesmtp_1.0.1.oe b/libesmtp/libesmtp_1.0.1.oe
index 38c00d40ec..f7b29f3831 100644
--- a/libesmtp/libesmtp_1.0.1.oe
+++ b/libesmtp/libesmtp_1.0.1.oe
@@ -12,9 +12,7 @@ inherit autotools libtool
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
- oe_soinstall .libs/libesmtp.so.5.1.2 ${STAGING_LIBDIR}/
+ oe_libinstall -a -so libesmtp ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}
install -m 644 auth-client.h ${STAGING_INCDIR}
diff --git a/libeventdb/libeventdb_0.15.oe b/libeventdb/libeventdb_0.15.oe
index f942bf9baf..61d7384cc6 100644
--- a/libeventdb/libeventdb_0.15.oe
+++ b/libeventdb/libeventdb_0.15.oe
@@ -11,7 +11,7 @@ SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libeventdb-${PV}.tar
headers = "event-db.h"
do_stage () {
- oe_soinstall libeventdb.so.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so libeventdb ${STAGING_LIBDIR}
mkdir -p ${STAGING_INCDIR}/gpe
for h in ${headers}; do
diff --git a/libgcrypt/libgcrypt_1.1.91.oe b/libgcrypt/libgcrypt_1.1.91.oe
index 12e7ab791f..a4fa79d549 100644
--- a/libgcrypt/libgcrypt_1.1.91.oe
+++ b/libgcrypt/libgcrypt_1.1.91.oe
@@ -11,8 +11,8 @@ inherit autotools libtool
EXTRA_OECONF = "--without-pth"
do_stage() {
- oe_soinstall src/.libs/libgcrypt.so.7.3.1 ${STAGING_LIBDIR}/
- oe_soinstall src/.libs/libgcrypt-pthread.so.7.3.1 ${STAGING_LIBDIR}/
+ oe_libinstall -so -C src libgcrypt ${STAGING_LIBDIR}
+ oe_libinstall -so -C src libgcrypt-pthread ${STAGING_LIBDIR}
install -m 0755 src/libgcrypt-config ${STAGING_BINDIR}/
install -d ${STAGING_INCDIR}/
diff --git a/libglade/libglade_2.0.1.oe b/libglade/libglade_2.0.1.oe
index b1211f9507..89bbcff35a 100644
--- a/libglade/libglade_2.0.1.oe
+++ b/libglade/libglade_2.0.1.oe
@@ -9,7 +9,6 @@ SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/libglade/2.0/libglade-${PV}.tar
inherit autotools pkgconfig libtool
-libname = "libglade-2.0.so.0.0.1"
headers = "glade-build.h glade-init.h glade-parser.h glade-xml.h glade.h"
do_configure_prepend() {
@@ -18,9 +17,7 @@ do_configure_prepend() {
}
do_stage () {
- oe_soinstall glade/.libs/${libname} ${STAGING_LIBDIR}/
- install -m 0644 glade/.libs/libglade-2.0.a ${STAGING_LIBDIR}/libglade-2.0.a
- install -m 0644 glade/.libs/libglade-2.0.lai ${STAGING_LIBDIR}/libglade-2.0.la
+ oe_libinstall -a -so -C glade libglade-2.0 ${STAGING_LIBDIR}
mkdir -p ${STAGING_INCDIR}/libglade-2.0/glade
for i in ${headers}; do
diff --git a/libgpepimc/libgpepimc_0.2.oe b/libgpepimc/libgpepimc_0.2.oe
index 779502fe1a..0cc6bcf1de 100644
--- a/libgpepimc/libgpepimc_0.2.oe
+++ b/libgpepimc/libgpepimc_0.2.oe
@@ -12,7 +12,7 @@ SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libgpepimc-${PV}.tar
headers = "pim-categories.h pim-categories-ui.h"
do_stage () {
- oe_soinstall libgpepimc.so.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so libgpepimc ${STAGING_LIBDIR}
mkdir -p ${STAGING_INCDIR}/gpe
for h in ${headers}; do
diff --git a/libgpepimc/libgpepimc_0.3.oe b/libgpepimc/libgpepimc_0.3.oe
index e69de29bb2..2d0f8e4aec 100644
--- a/libgpepimc/libgpepimc_0.3.oe
+++ b/libgpepimc/libgpepimc_0.3.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "Common code for GPE PIMs"
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "libgpewidget libdisplaymigration gtk+ sqlite"
+
+inherit pkgconfig gpe
+
+SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libgpepimc-${PV}.tar.gz"
+
+headers = "pim-categories.h pim-categories-ui.h"
+
+do_stage () {
+ oe_libinstall -so libgpepimc ${STAGING_LIBDIR}
+
+ mkdir -p ${STAGING_INCDIR}/gpe
+ for h in ${headers}; do
+ install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
+ done
+}
+
+do_install () {
+ gpe_do_install
+ oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel
+}
diff --git a/libgpevtype/libgpevtype_0.3.oe b/libgpevtype/libgpevtype_0.3.oe
index 4875af7c6b..f72e91d1a5 100644
--- a/libgpevtype/libgpevtype_0.3.oe
+++ b/libgpevtype/libgpevtype_0.3.oe
@@ -11,7 +11,7 @@ SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libgpevtype-${PV}.ta
headers = "tag-db.h vcard.h vevent.h vtodo.h"
do_stage () {
- oe_soinstall libgpevtype.so.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so libgpevtype ${STAGING_LIBDIR}
mkdir -p ${STAGING_INCDIR}/gpe
for h in ${headers}; do
diff --git a/libgpewidget/libgpewidget_0.78.oe b/libgpewidget/libgpewidget_0.78.oe
index b77ea657de..df2bf27a26 100644
--- a/libgpewidget/libgpewidget_0.78.oe
+++ b/libgpewidget/libgpewidget_0.78.oe
@@ -12,7 +12,7 @@ SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libgpewidget-${PV}.t
headers = "init.h render.h errorbox.h smallbox.h pixmaps.h gpetimesel.h gtkdatecombo.h dirbrowser.h stylus.h picturebutton.h popup_menu.h spacing.h translabel.h question.h windows.h gpe-iconlist.h gtksimplemenu.h gpewindowlist.h tray.h popup.h"
do_stage () {
- oe_soinstall ${S}/libgpewidget.so.1 ${STAGING_LIBDIR}/
+ oe_libinstall -so libgpewidget ${STAGING_LIBDIR}
mkdir -p ${STAGING_INCDIR}/gpe
for h in ${headers}; do
diff --git a/libgpg-error/libgpg-error_0.6.oe b/libgpg-error/libgpg-error_0.6.oe
index a53982d896..63e7edfe74 100644
--- a/libgpg-error/libgpg-error_0.6.oe
+++ b/libgpg-error/libgpg-error_0.6.oe
@@ -9,9 +9,8 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-${PV}.tar.
inherit autotools libtool
do_stage() {
- oe_soinstall src/.libs/libgpg-error.so.0.1.1 ${STAGING_LIBDIR}/
+ oe_libinstall -so -C src libgpg-error ${STAGING_LIBDIR}
install -m 0755 src/gpg-error-config ${STAGING_BINDIR}/
- install -m 0644 src/.libs/libgpg-error.lai ${STAGING_LIBDIR}/libgpg-error.la
install -d ${STAGING_INCDIR}/
for X in gpg-error.h
diff --git a/libgpg-error/libgpg-error_0.7.oe b/libgpg-error/libgpg-error_0.7.oe
index 9744691a7e..3438710a04 100644
--- a/libgpg-error/libgpg-error_0.7.oe
+++ b/libgpg-error/libgpg-error_0.7.oe
@@ -9,10 +9,8 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/alpha/libgpg-error/libgpg-error-${PV}.tar.
inherit autotools libtool
do_stage() {
- oe_soinstall src/.libs/libgpg-error.so.0.1.2 ${STAGING_LIBDIR}/
+ oe_libinstall -a -so -C src libgpg-error ${STAGING_LIBDIR}
install -m 0755 src/gpg-error-config ${STAGING_BINDIR}/
- install -m 0644 src/.libs/libgpg-error.lai ${STAGING_LIBDIR}/libgpg-error.la
- install -m 0644 src/.libs/libgpg-error.a ${STAGING_LIBDIR}/libgpg-error.a
install -d ${STAGING_INCDIR}/
for X in gpg-error.h
diff --git a/libid3tag/libid3tag_0.15.0b.oe b/libid3tag/libid3tag_0.15.0b.oe
index 70481a7dd6..63060eb85f 100644
--- a/libid3tag/libid3tag_0.15.0b.oe
+++ b/libid3tag/libid3tag_0.15.0b.oe
@@ -12,6 +12,6 @@ inherit autotools libtool
EXTRA_OECONF = "-enable-speed"
do_stage() {
- oe_soinstall .libs/libid3tag.so.0.2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so libid3tag ${STAGING_LIBDIR}
install -m 0644 id3tag.h ${STAGING_INCDIR}
}
diff --git a/libmad/libmad_0.15.0b.oe b/libmad/libmad_0.15.0b.oe
index 19bf65e1be..e4081d4f76 100644
--- a/libmad/libmad_0.15.0b.oe
+++ b/libmad/libmad_0.15.0b.oe
@@ -17,7 +17,6 @@ do_configure_prepend () {
}
do_stage() {
- oe_soinstall .libs/libmad.so.0.2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so libmad ${STAGING_LIBDIR}
install -m 0644 mad.h ${STAGING_INCDIR}
}
-
diff --git a/libmatchbox/libmatchbox_1.1.oe b/libmatchbox/libmatchbox_1.1.oe
index b864694b11..7db7fa7dfa 100644
--- a/libmatchbox/libmatchbox_1.1.oe
+++ b/libmatchbox/libmatchbox_1.1.oe
@@ -18,8 +18,5 @@ do_stage () {
install -m 0644 ${S}/libmb/$h ${STAGING_INCDIR}/libmb/
done
- cp -a ${S}/libmb/.libs/libmb.a ${STAGING_LIBDIR}/libmb.a
- cp -a ${S}/libmb/libmb.lai ${STAGING_LIBDIR}/libmb.la
- oe_soinstall ${S}/libmb/.libs/libmb.so.1.0.1 ${STAGING_LIBDIR}/
-# cp -a ${S}/libmb.pc ${STAGING_LIBDIR}/pkgconfig/libmb.pc
+ oe_libinstall -a -so -C libmb libmb ${STAGING_LIBDIR}
}
diff --git a/libmatchbox/libmatchbox_1.2.oe b/libmatchbox/libmatchbox_1.2.oe
index ed263fd064..7db7fa7dfa 100644
--- a/libmatchbox/libmatchbox_1.2.oe
+++ b/libmatchbox/libmatchbox_1.2.oe
@@ -12,16 +12,11 @@ EXTRA_OECONF = "--enable-jpeg --enable-pango"
headers = "hash.h mbconfig.h mbdotdesktop.h mbexp.h \
mb.h mbmenu.h mbpixbuf.h mbtray.h mbutil.h"
-SOV = 1.0.2
-
do_stage () {
install -d ${STAGING_INCDIR}/libmb
for h in ${headers}; do
install -m 0644 ${S}/libmb/$h ${STAGING_INCDIR}/libmb/
done
- cp -a ${S}/libmb/.libs/libmb.a ${STAGING_LIBDIR}/libmb.a
- cp -a ${S}/libmb/.libs/libmb.lai ${STAGING_LIBDIR}/libmb.la
- oe_soinstall ${S}/libmb/.libs/libmb.so.${SOV} ${STAGING_LIBDIR}/
-# cp -a ${S}/libmb.pc ${STAGING_LIBDIR}/pkgconfig/libmb.pc
+ oe_libinstall -a -so -C libmb libmb ${STAGING_LIBDIR}
}
diff --git a/libmikey/libmikey_0.1a.oe b/libmikey/libmikey_0.1a.oe
index e69de29bb2..97e81b24d2 100644
--- a/libmikey/libmikey_0.1a.oe
+++ b/libmikey/libmikey_0.1a.oe
@@ -0,0 +1,21 @@
+DESCRIPTION = "libmikey is a C++ library that implements the IETF work-in-progress MIKEY protocol."
+HOMEPAGE = "http://minisip.org/libmikey"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "virtual/libc openssl"
+
+SRC_URI = "http://minisip.org/source/libmikey-${PV}.tar.gz"
+S = "${WORKDIR}/libmikey-0.1"
+
+inherit autotools libtool
+
+do_configure() {
+ oe_runconf
+}
+
+do_stage() {
+ oe_libinstall -so libmikey ${STAGING_LIBDIR}
+
+ install -d ${STAGING_INCDIR}/libmikey
+ install -m 0644 include/libmikey/*.h ${STAGING_INCDIR}/libmikey/
+}
diff --git a/libmikmod/libmikmod_3.1.11.oe b/libmikmod/libmikmod_3.1.11.oe
index 7590911899..91e8f095ca 100644
--- a/libmikmod/libmikmod_3.1.11.oe
+++ b/libmikmod/libmikmod_3.1.11.oe
@@ -16,9 +16,6 @@ do_configure() {
}
do_stage() {
- oe_soinstall libmikmod/.libs/libmikmod.so.2.0.4 ${STAGING_LIBDIR}/
- install -m 0644 libmikmod/.libs/libmikmod.lai ${STAGING_LIBDIR}/libmikmod.la
- install -m 0644 libmikmod/.libs/libmikmod.a ${STAGING_LIBDIR}/libmikmod.a
+ oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR}
install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/
}
-
diff --git a/libmikmod/libmikmod_3.2.0-beta2.oe b/libmikmod/libmikmod_3.2.0-beta2.oe
index 606bb998df..b86cd19105 100644
--- a/libmikmod/libmikmod_3.2.0-beta2.oe
+++ b/libmikmod/libmikmod_3.2.0-beta2.oe
@@ -16,9 +16,7 @@ do_configure() {
}
do_stage() {
- oe_soinstall libmikmod/.libs/libmikmod.so.3.0.0 ${STAGING_LIBDIR}/
- install -m 0644 libmikmod/.libs/libmikmod.a ${STAGING_LIBDIR}/
- install -m 0644 libmikmod/.libs/libmikmod.lai ${STAGING_LIBDIR}/libmikmod.la
+ oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR}
install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/
cat libmikmod-config | sed 's,$libdir , ,' \
diff --git a/libmimedir/libmimedir_0.0-20040307.oe b/libmimedir/libmimedir_0.0-20040307.oe
index 59931bea7b..5f1e4a9a4c 100644
--- a/libmimedir/libmimedir_0.0-20040307.oe
+++ b/libmimedir/libmimedir_0.0-20040307.oe
@@ -11,15 +11,11 @@ inherit autotools libtool pkgconfig
headers = "mimedir-attachment.h mimedir-attendee.h mimedir-attribute.h mimedir-datetime.h mimedir-init.h mimedir-period.h mimedir-profile.h mimedir-recurrence-rule.h mimedir-recurrence.h mimedir-valarm.h mimedir-vcal.h mimedir-vcard-address.h mimedir-vcard-email.h mimedir-vcard-phone.h mimedir-vcard.h mimedir-vcomponent.h mimedir-vevent.h mimedir-vfreebusy.h mimedir-vjournal.h mimedir-vtimezone.h mimedir-vtodo.h mimedir.h"
-libname = "libmimedir-0.2.so.0.0.0"
-
do_stage() {
install -d ${STAGING_INCDIR}/mimedir-1.0/mimedir
for i in ${headers}; do
install -m 0644 ${S}/mimedir/$i ${STAGING_INCDIR}/mimedir-1.0/mimedir/$i
done
- oe_soinstall mimedir/.libs/${libname} ${STAGING_LIBDIR}/
- ln -sf ${libname} ${STAGING_LIBDIR}/libmimedir.so
- install -m 0755 mimedir/libmimedir.la ${STAGING_LIBDIR}/
+ oe_libinstall -so -C mimedir libmimedir-0.2 ${STAGING_LIBDIR}
}
diff --git a/libogg/libogg_1.0.oe b/libogg/libogg_1.0.oe
index 60b7fe830c..7e5097b23e 100644
--- a/libogg/libogg_1.0.oe
+++ b/libogg/libogg_1.0.oe
@@ -9,9 +9,7 @@ SRC_URI = "http://www.vorbis.com/files/${PV}/unix/libogg-${PV}.tar.gz"
inherit autotools libtool
do_stage () {
- install -m 0644 src/.libs/libogg.a ${STAGING_LIBDIR}/
- install -m 0644 src/.libs/libogg.lai ${STAGING_LIBDIR}/libogg.la
- oe_soinstall src/.libs/libogg.so.0.4.0 ${STAGING_LIBDIR}/
+ oe_libinstall -a -so -C src libogg ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/ogg
(cd ${S}/include/ogg; cp config_types.h ogg.h os_types.h ${STAGING_INCDIR}/ogg/)
diff --git a/libogg/libogg_1.1.oe b/libogg/libogg_1.1.oe
index 501a490a96..be8a3c300a 100644
--- a/libogg/libogg_1.1.oe
+++ b/libogg/libogg_1.1.oe
@@ -9,9 +9,7 @@ SRC_URI = "http://www.vorbis.com/files/1.0.1/unix/libogg-${PV}.tar.gz"
inherit autotools libtool
do_stage () {
- install -m 0644 src/.libs/libogg.a ${STAGING_LIBDIR}/
- install -m 0644 src/.libs/libogg.lai ${STAGING_LIBDIR}/libogg.la
- oe_soinstall src/.libs/libogg.so.0.5.0 ${STAGING_LIBDIR}/
+ oe_libinstall -a -so -C src libogg ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/ogg
(cd ${S}/include/ogg; cp config_types.h ogg.h os_types.h ${STAGING_INCDIR}/ogg/)
diff --git a/liboop/liboop_1.0.oe b/liboop/liboop_1.0.oe
index 3532fade2c..ec598ed4c2 100644
--- a/liboop/liboop_1.0.oe
+++ b/liboop/liboop_1.0.oe
@@ -12,8 +12,6 @@ headers = "oop.h oop-adns.h oop-glib.h \
oop-tcl.h oop-www.h oop-rl.h \
oop-read.h"
do_stage () {
- oe_soinstall .libs/liboop.so.4.0.1 ${STAGING_LIBDIR}/
- install -m 0644 .libs/liboop.lai ${STAGING_LIBDIR}/liboop.la
- install -m 0644 .libs/liboop.a ${STAGING_LIBDIR}/liboop.a
+ oe_libinstall -a -so liboop ${STAGING_LIBDIR}
install -m 0644 ${headers} ${STAGING_INCDIR}/
}
diff --git a/libopie/libopie2_cvs.oe b/libopie/libopie2_cvs.oe
index f8fd8400f0..005d171697 100644
--- a/libopie/libopie2_cvs.oe
+++ b/libopie/libopie2_cvs.oe
@@ -42,13 +42,12 @@ do_stage() {
}
do_install() {
- install -d ${D}${palmtopdir}/lib/
- oe_soinstall ${STAGING_LIBDIR}/libopiecore2.so.1.9.1 ${D}${palmtopdir}/lib/
- oe_soinstall ${STAGING_LIBDIR}/libopiedb2.so.1.9.0 ${D}${palmtopdir}/lib/
- oe_soinstall ${STAGING_LIBDIR}/libopiemm2.so.1.9.0 ${D}${palmtopdir}/lib/
- oe_soinstall ${STAGING_LIBDIR}/libopienet2.so.1.8.4 ${D}${palmtopdir}/lib/
- oe_soinstall ${STAGING_LIBDIR}/libopiepim2.so.1.8.6 ${D}${palmtopdir}/lib/
- oe_soinstall ${STAGING_LIBDIR}/libopieui2.so.1.8.5 ${D}${palmtopdir}/lib/
+ oe_libinstall -so -C ${STAGING_LIBDIR} libopiecore2 ${D}/${palmtopdir}/lib
+ oe_libinstall -so -C ${STAGING_LIBDIR} libopiedb2 ${D}/${palmtopdir}/lib
+ oe_libinstall -so -C ${STAGING_LIBDIR} libopiemm2 ${D}/${palmtopdir}/lib
+ oe_libinstall -so -C ${STAGING_LIBDIR} libopienet2 ${D}/${palmtopdir}/lib
+ oe_libinstall -so -C ${STAGING_LIBDIR} libopiepim2 ${D}/${palmtopdir}/lib
+ oe_libinstall -so -C ${STAGING_LIBDIR} libopieui2 ${D}/${palmtopdir}/lib
}
PACKAGES = "libopiecore2 libopiedb2 libopiemm2 libopienet2 libopiepim2 libopieui2"
diff --git a/libpcap/libpcap_0.7.2.oe b/libpcap/libpcap_0.7.2.oe
index c02bd2b4d1..cc53cfed06 100644
--- a/libpcap/libpcap_0.7.2.oe
+++ b/libpcap/libpcap_0.7.2.oe
@@ -27,6 +27,5 @@ do_stage () {
install -m 0644 net/bpf.h ${STAGING_INCDIR}/net/bpf.h
install -m 0644 pcap.h ${STAGING_INCDIR}/pcap.h
install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h
- oe_soinstall libpcap.so.${PV} ${STAGING_LIBDIR}/
- install -m 0644 libpcap.a ${STAGING_LIBDIR}/
+ oe_libinstall -a -so libpcap ${STAGING_LIBDIR}
}
diff --git a/libpcap/libpcap_0.8.1.oe b/libpcap/libpcap_0.8.1.oe
index 2332d545a9..2c7a3129a5 100644
--- a/libpcap/libpcap_0.8.1.oe
+++ b/libpcap/libpcap_0.8.1.oe
@@ -23,6 +23,5 @@ do_stage () {
install -m 0644 pcap.h ${STAGING_INCDIR}/pcap.h
install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h
install -m 0644 pcap-bpf.h ${STAGING_INCDIR}/pcap-bpf.h
- oe_soinstall libpcap.so.${PV} ${STAGING_LIBDIR}/
- install -m 0644 libpcap.a ${STAGING_LIBDIR}/
+ oe_libinstall -a -so libpcap ${STAGING_LIBDIR}
}
diff --git a/libpcap/libpcap_0.8.3.oe b/libpcap/libpcap_0.8.3.oe
index e69de29bb2..d36454f4fb 100644
--- a/libpcap/libpcap_0.8.3.oe
+++ b/libpcap/libpcap_0.8.3.oe
@@ -0,0 +1,29 @@
+DESCRIPTION = "Network Packet Capture Library"
+SECTION = "libs"
+PRIORITY = "required"
+RDEPENDS = "libc6"
+DEPENDS = "virtual/libc"
+
+SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz; \
+ file://${FILESDIR}/shared.patch;patch=1"
+
+# file://${FILESDIR}/configure.patch;patch=1"
+
+inherit autotools
+
+EXTRA_OECONF = "--with-pcap=linux"
+
+do_configure_prepend () {
+ if [ ! -e acinclude.m4 ]; then
+ cat aclocal.m4 > acinclude.m4
+ fi
+}
+
+do_stage () {
+ install -d ${STAGING_INCDIR}/net
+ install -m 0644 net/bpf.h ${STAGING_INCDIR}/net/bpf.h
+ install -m 0644 pcap.h ${STAGING_INCDIR}/pcap.h
+ install -m 0644 pcap-namedb.h ${STAGING_INCDIR}/pcap-namedb.h
+ install -m 0644 pcap-bpf.h ${STAGING_INCDIR}/pcap-bpf.h
+ oe_libinstall -a -so libpcap ${STAGING_LIBDIR}
+}
diff --git a/libpng/libpng_1.2.5.oe b/libpng/libpng_1.2.5.oe
index 6629469c49..e1991f9d9d 100644
--- a/libpng/libpng_1.2.5.oe
+++ b/libpng/libpng_1.2.5.oe
@@ -27,9 +27,8 @@ do_stage() {
cp libpng.pc libpng12.pc
install -m 644 png.h ${STAGING_INCDIR}/png.h
install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
- oe_soinstall libpng12.so.0.${PV} ${STAGING_LIBDIR}/
- ln -sf ./libpng12.so ${STAGING_LIBDIR}/libpng.so.3
- ln -sf ./libpng12.so ${STAGING_LIBDIR}/libpng.so
+ oe_libinstall -so libpng12 ${STAGING_LIBDIR}
+ ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
}
do_install() {
diff --git a/libqpe/libqpe-opie_cvs.oe b/libqpe/libqpe-opie_cvs.oe
index 5e90ccc349..098dfbeebe 100644
--- a/libqpe/libqpe-opie_cvs.oe
+++ b/libqpe/libqpe-opie_cvs.oe
@@ -42,13 +42,12 @@ do_compile() {
}
do_stage() {
- [ -e ${STAGING_LIBDIR}/libqpe.so.1.5.0 ] || oe_soinstall libqpe.so.1.5.0 ${STAGING_LIBDIR}
+ oe_libinstall -so libqpe ${STAGING_LIBDIR}
# include files already done during do_compile
}
do_install() {
- install -d ${D}${palmtopdir}/lib
- oe_soinstall ${STAGING_LIBDIR}/libqpe.so.1.5.0 ${D}${palmtopdir}/lib
+ oe_libinstall -so libqpe ${D}/${palmtopdir}/lib
}
PACKAGES = "libqpe1"
diff --git a/libqtaux/libqtaux2_cvs.oe b/libqtaux/libqtaux2_cvs.oe
index 71e4404ed6..7391e8b2d2 100644
--- a/libqtaux/libqtaux2_cvs.oe
+++ b/libqtaux/libqtaux2_cvs.oe
@@ -28,8 +28,7 @@ do_compile() {
# lib files already done during do_compile
do_install() {
- install -d ${D}${palmtopdir}/lib/
- oe_soinstall ${STAGING_LIBDIR}/libqtaux2.so.1.0.0 ${D}${palmtopdir}/lib/
+ oe_libinstall -so -C ${STAGING_LIBDIR} libqtaux2 ${D}/${palmtopdir}/lib
}
FILES_${PN}=${palmtopdir}/lib
diff --git a/libschedule/libschedule_0.13.oe b/libschedule/libschedule_0.13.oe
index e69de29bb2..fc7c65639b 100644
--- a/libschedule/libschedule_0.13.oe
+++ b/libschedule/libschedule_0.13.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "RTC alarm handling library for GPE"
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0"
+
+inherit pkgconfig gpe
+
+SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libschedule-${PV}.tar.gz"
+
+headers = "schedule.h"
+
+do_stage () {
+ oe_libinstall -so libschedule ${STAGING_LIBDIR}
+
+ mkdir -p ${STAGING_INCDIR}/gpe
+ for h in ${headers}; do
+ install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
+ done
+}
+
+do_install () {
+ gpe_do_install
+ oe_runmake PREFIX=${PREFIX} DESTDIR=${D} install-devel
+}
diff --git a/libsdl/libsdl-image_1.2.3.oe b/libsdl/libsdl-image_1.2.3.oe
index 97a5b3dfdc..9c54849fe7 100644
--- a/libsdl/libsdl-image_1.2.3.oe
+++ b/libsdl/libsdl-image_1.2.3.oe
@@ -10,8 +10,8 @@ S = "${WORKDIR}/SDL_image-${PV}"
inherit autotools libtool
do_stage() {
- oe_soinstall .libs/libSDL_image-1.2.so.0.1.2 ${STAGING_LIBDIR}
- ln -sf libSDL_image-1.2.so.0.1.2 ${STAGING_LIBDIR}/libSDL_image.so
+ oe_libinstall -so libSDL_image-1.2 ${STAGING_LIBDIR}
+ ln -sf libSDL_image-1.2.so ${STAGING_LIBDIR}/libSDL_image.so
install -m 0644 SDL_image.h ${STAGING_INCDIR}/SDL/SDL_image.h
}
diff --git a/libsdl/libsdl-mixer_1.2.5.oe b/libsdl/libsdl-mixer_1.2.5.oe
index 4fcacf867b..2f51ae240e 100644
--- a/libsdl/libsdl-mixer_1.2.5.oe
+++ b/libsdl/libsdl-mixer_1.2.5.oe
@@ -14,8 +14,8 @@ EXTRA_OECONF = "--disable-music-mp3"
# to deal with optional dependencies
do_stage() {
- oe_soinstall .libs/libSDL_mixer-1.2.so.0.2.3 ${STAGING_LIBDIR}
- ln -sf libSDL_mixer-1.2.so.0.2.3 ${STAGING_LIBDIR}/libSDL_mixer.so
+ oe_libinstall -so libSDL_mixer-1.2 ${STAGING_LIBDIR}
+ ln -sf libSDL_mixer-1.2.so ${STAGING_LIBDIR}/libSDL_mixer.so
install -m 0644 SDL_mixer.h ${STAGING_INCDIR}/SDL/SDL_mixer.h
}
diff --git a/libsdl/libsdl-net_1.2.5.oe b/libsdl/libsdl-net_1.2.5.oe
index 6353e408ca..975f8c190f 100644
--- a/libsdl/libsdl-net_1.2.5.oe
+++ b/libsdl/libsdl-net_1.2.5.oe
@@ -10,8 +10,8 @@ S = "${WORKDIR}/SDL_net-${PV}"
inherit autotools libtool
do_stage() {
- oe_soinstall .libs/libSDL_net-1.2.so.0.0.5 ${STAGING_LIBDIR}
- ln -sf libSDL_net-1.2.so.0.0.5 ${STAGING_LIBDIR}/libSDL_net.so
+ oe_libinstall -so libSDL_net-1.2 ${STAGING_LIBDIR}
+ ln -sf libSDL_net-1.2.so ${STAGING_LIBDIR}/libSDL_net.so
install -m 0644 SDL_net.h ${STAGING_INCDIR}/SDL/SDL_net.h
}
diff --git a/libsdl/libsdl-qpe_1.2.7.oe b/libsdl/libsdl-qpe_1.2.7.oe
index f7356852aa..90fc61b56b 100644
--- a/libsdl/libsdl-qpe_1.2.7.oe
+++ b/libsdl/libsdl-qpe_1.2.7.oe
@@ -22,8 +22,8 @@ EXTRA_OECONF = "--disable-debug --enable-cdrom --enable-threads --enable-timers
--disable-video-picogui --enable-video-qtopia --enable-dlopen"
do_stage() {
- oe_soinstall src/.libs/libSDL-1.2.so.0.7.0 ${STAGING_LIBDIR}
- ln -sf libSDL-1.2.so.0.7.0 ${STAGING_LIBDIR}/libSDL.so
+ oe_libinstall -so libSDL-1.2 ${STAGING_LIBDIR}
+ ln -sf libSDL-1.2.so ${STAGING_LIBDIR}/libSDL.so
install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}/libSDLmain.a
install -d ${STAGING_INCDIR}/SDL
diff --git a/libsdl/libsdl-ttf_2.0.3.oe b/libsdl/libsdl-ttf_2.0.3.oe
index b9319a9e8e..b02210f843 100644
--- a/libsdl/libsdl-ttf_2.0.3.oe
+++ b/libsdl/libsdl-ttf_2.0.3.oe
@@ -11,8 +11,8 @@ S = "${WORKDIR}/SDL_ttf-${PV}"
inherit autotools libtool
do_stage() {
- oe_soinstall .libs/libSDL_ttf-2.0.so.0.0.3 ${STAGING_LIBDIR}
- ln -sf libSDL_ttf-2.0.so.0.0.3 ${STAGING_LIBDIR}/libSDL_ttf.so
+ oe_libinstall -so libSDL_ttf-2.0 ${STAGING_LIBDIR}
+ ln -sf libSDL_ttf-2.0.so ${STAGING_LIBDIR}/libSDL_ttf.so
install -m 0644 SDL_ttf.h ${STAGING_INCDIR}/SDL/SDL_ttf.h
}
diff --git a/libsdl/libsdl-x11_1.2.7.oe b/libsdl/libsdl-x11_1.2.7.oe
index 2f06ea1d79..f078112280 100644
--- a/libsdl/libsdl-x11_1.2.7.oe
+++ b/libsdl/libsdl-x11_1.2.7.oe
@@ -21,8 +21,8 @@ EXTRA_OECONF = "--disable-debug --disable-cdrom --enable-threads --enable-timers
--disable-video-picogui --disable-video-qtopia --enable-dlopen"
do_stage() {
- oe_soinstall src/.libs/libSDL-1.2.so.0.7.0 ${STAGING_LIBDIR}
- ln -sf libSDL-1.2.so.0.7.0 ${STAGING_LIBDIR}/libSDL.so
+ oe_libinstall -so libSDL-1.2 ${STAGING_LIBDIR}
+ ln -sf libSDL-1.2.so ${STAGING_LIBDIR}/libSDL.so
install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}/libSDLmain.a
install -d ${STAGING_INCDIR}/SDL
diff --git a/libsidplay/libsidplay_1.36.57.oe b/libsidplay/libsidplay_1.36.57.oe
index 0d7c25e918..23eb9da0be 100644
--- a/libsidplay/libsidplay_1.36.57.oe
+++ b/libsidplay/libsidplay_1.36.57.oe
@@ -9,7 +9,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/libs/libsidplay/libsidplay_${PV}.orig.tar.gz \
inherit autotools libtool
do_stage() {
- oe_soinstall src/.libs/libsidplay.so.1.0.3 ${STAGING_LIBDIR}/
+ oe_libinstall -so -C src libsidplay ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/sidplay
for f in src/compconf.h src/emucfg.h src/fformat.h src/fixpoint.h src/libcfg.h src/myendian.h src/mytypes.h src/player.h src/sidtune.h src/version.h
do
diff --git a/libsigc++/libsigc++_1.2.5.oe b/libsigc++/libsigc++_1.2.5.oe
index 96721e0b38..ce7826d985 100644
--- a/libsigc++/libsigc++_1.2.5.oe
+++ b/libsigc++/libsigc++_1.2.5.oe
@@ -10,8 +10,7 @@ inherit autotools libtool pkgconfig
acpaths = "-I ${S}/scripts"
do_stage() {
- oe_soinstall sigc++/.libs/libsigc-1.2.so.5.0.5 ${STAGING_LIBDIR}/
- install -m 0755 sigc++/.libs/libsigc-1.2.la ${STAGING_LIBDIR}/
+ oe_libinstall -so -C sigc++ libsigc-1.2 ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/sigc++/
for f in sigc++/*.h
diff --git a/libtododb/libtododb_0.07.oe b/libtododb/libtododb_0.07.oe
index 500f36fc85..edd816672a 100644
--- a/libtododb/libtododb_0.07.oe
+++ b/libtododb/libtododb_0.07.oe
@@ -11,7 +11,7 @@ SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libtododb-${PV}.tar.
headers = "todo-db.h"
do_stage () {
- oe_soinstall libtododb.so.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so libtododb ${STAGING_LIBDIR}
mkdir -p ${STAGING_INCDIR}/gpe
for h in ${headers}; do
diff --git a/libtool/libtool-cross_1.5.oe b/libtool/libtool-cross_1.5.oe
index 6d5c4f36be..d8230bde51 100644
--- a/libtool/libtool-cross_1.5.oe
+++ b/libtool/libtool-cross_1.5.oe
@@ -1,6 +1,7 @@
include libtool_${PV}.oe
-# This is a cross tool, but doesn't really fit in with the cross
-# build system, so we don't actually "inherit cross" here.
+
+PACKAGES = ""
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libtool-${PV}"
SRC_URI_append = " file://${FILESDIR}/libdir-la.patch;patch=1 \
file://${FILESDIR}/sedvar.patch;patch=1 \
file://${FILESDIR}/tag.patch;patch=1 \
@@ -9,33 +10,17 @@ SRC_URI_append = " file://${FILESDIR}/libdir-la.patch;patch=1 \
file://${FILESDIR}/ld.patch;patch=1 \
file://${FILESDIR}/chmod.patch;patch=1"
S = "${WORKDIR}/libtool-${PV}"
-FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libtool-${PV}"
prefix = "${CROSS_DIR}"
exec_prefix = "${prefix}"
-EXTRA_OECONF_append = " --program-prefix=${TARGET_SYS}-"
-
-PACKAGES = ""
+do_compile () {
+}
do_stage () {
- oe_runmake install
- install -d ${STAGING_DATADIR}/libtool \
- ${STAGING_DATADIR}/aclocal
- install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
- install -m 0755 libtoolize ${STAGING_BINDIR}/${HOST_SYS}-libtoolize
- install -c config.guess ${STAGING_DATADIR}/libtool/config.guess
- install -c config.sub ${STAGING_DATADIR}/libtool/config.sub
- install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/
- install -c -m 0644 m4/libtool.m4 ${STAGING_DATADIR}/aclocal/
- install -c -m 0644 m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/
-
- install -m 0644 libltdl/.libs/libltdl.a ${STAGING_LIBDIR}/
- install -m 0644 libltdl/.libs/libltdl.lai ${STAGING_LIBDIR}/libltdl.la
- oe_soinstall libltdl/.libs/libltdl.so.3.1.0 ${STAGING_LIBDIR}/
- install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
+ install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
+ install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool
}
do_install () {
- :
}
diff --git a/libtool/libtool-native_1.5.oe b/libtool/libtool-native_1.5.oe
index 4f5eb57953..7014467e57 100644
--- a/libtool/libtool-native_1.5.oe
+++ b/libtool/libtool-native_1.5.oe
@@ -16,23 +16,19 @@ S = "${WORKDIR}/libtool-${PV}"
prefix = "${CROSS_DIR}"
exec_prefix = "${prefix}"
-EXTRA_OECONF_append = " --program-prefix=${TARGET_SYS}-"
-
do_stage () {
oe_runmake install
install -d ${STAGING_DATADIR}/libtool \
${STAGING_DATADIR}/aclocal
install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
- install -m 0755 libtoolize ${STAGING_BINDIR}/${HOST_SYS}-libtoolize
+ install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize
install -c config.guess ${STAGING_DATADIR}/libtool/config.guess
install -c config.sub ${STAGING_DATADIR}/libtool/config.sub
install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/
install -c -m 0644 m4/libtool.m4 ${STAGING_DATADIR}/aclocal/
install -c -m 0644 m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/
- install -m 0644 libltdl/.libs/libltdl.a ${STAGING_LIBDIR}/
- install -m 0644 libltdl/.libs/libltdl.lai ${STAGING_LIBDIR}/libltdl.la
- oe_soinstall libltdl/.libs/libltdl.so.3.1.0 ${STAGING_LIBDIR}/
+ oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR}
install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
install -d ${CROSS_DATADIR}/libtool/
diff --git a/libusb/libusb_0.1.7.oe b/libusb/libusb_0.1.7.oe
index 587a325be9..af9d574df7 100644
--- a/libusb/libusb_0.1.7.oe
+++ b/libusb/libusb_0.1.7.oe
@@ -8,10 +8,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.gz \
inherit autotools libtool
do_stage() {
- oe_soinstall .libs/libusb.so ${STAGING_LIBDIR}/
- install -m 0644 .libs/libusb.lai ${STAGING_LIBDIR}/libusb.la
- install -m 0644 .libs/libusb.a ${STAGING_LIBDIR}/libusb.a
-
+ oe_libinstall -a -so libusb ${STAGING_LIBDIR}
+
install -d ${STAGING_INCDIR}/
for X in usb.h
do
diff --git a/libvorbis/libvorbis_1.0.1.oe b/libvorbis/libvorbis_1.0.1.oe
index b67752ba1d..1a7d3e04fc 100644
--- a/libvorbis/libvorbis_1.0.1.oe
+++ b/libvorbis/libvorbis_1.0.1.oe
@@ -12,17 +12,9 @@ EXTRA_OECONF = "--with-ogg-libraries=${STAGING_LIBDIR} \
--with-ogg-includes=${STAGING_INCDIR}"
do_stage () {
- install -m 0644 lib/.libs/libvorbis.lai ${STAGING_LIBDIR}/libvorbis.la
- install -m 0644 lib/.libs/libvorbis.a ${STAGING_LIBDIR}/
- oe_soinstall lib/.libs/libvorbis.so.0.3.0 ${STAGING_LIBDIR}/
-
- install -m 0644 lib/.libs/libvorbisfile.lai ${STAGING_LIBDIR}/libvorbisfile.la
- install -m 0644 lib/.libs/libvorbisfile.a ${STAGING_LIBDIR}/
- oe_soinstall lib/.libs/libvorbisfile.so.3.1.0 ${STAGING_LIBDIR}/
-
- install -m 0644 lib/.libs/libvorbisenc.lai ${STAGING_LIBDIR}/libvorbisenc.la
- install -m 0644 lib/.libs/libvorbisenc.a ${STAGING_LIBDIR}/
- oe_soinstall lib/.libs/libvorbisenc.so.2.0.0 ${STAGING_LIBDIR}/
+ oe_libinstall -a -so -C lib libvorbis ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C lib libvorbisfile ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C lib libvorbisenc ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/vorbis
install -m 0644 include/vorbis/vorbisenc.h \
diff --git a/libxine/libxine_1.0.0-beta12.oe b/libxine/libxine_1.0.0-beta12.oe
index 4521689ee9..6a66297e3e 100644
--- a/libxine/libxine_1.0.0-beta12.oe
+++ b/libxine/libxine_1.0.0-beta12.oe
@@ -40,12 +40,12 @@ do_install() {
-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
+ dir=`dirname $plugin`
+ libname=`basename $plugin|sed -e's,\.la,,'`
+ oe_libinstall -so -C $dir $libname ${D}/${libdir}/xine/plugins/1.0.0
done
- oe_soinstall src/xine-engine/.libs/libxine.so.${SOV} ${D}/${libdir}/
+ oe_libinstall -so -C src/xine-engine libxine ${D}/${libdir}
}
do_stage() {
@@ -59,10 +59,10 @@ do_stage() {
'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
+ dir=`dirname $plugin`
+ libname=`basename $plugin|sed -e's,\.la,,'`
+ oe_libinstall -so -C $dir $libname ${STAGING_LIBDIR}/xine/plugins/1.0.0
done
- oe_soinstall src/xine-engine/.libs/libxine.so.${SOV} ${STAGING_LIBDIR}/
+ oe_libinstall -so -C src/xine-engine libxine ${STAGING_LIBDIR}
}
diff --git a/libxml/libxml2_2.6.7.oe b/libxml/libxml2_2.6.7.oe
index 03b9b36fee..015fd1e31f 100644
--- a/libxml/libxml2_2.6.7.oe
+++ b/libxml/libxml2_2.6.7.oe
@@ -10,13 +10,10 @@ inherit autotools pkgconfig libtool
EXTRA_OECONF = "--without-python"
-libname = "libxml2.so.2.6.7"
headers = "DOCBparser.h HTMLparser.h HTMLtree.h SAX.h SAX2.h c14n.h catalog.h chvalid.h debugXML.h dict.h encoding.h entities.h globals.h hash.h list.h nanoftp.h nanohttp.h parser.h parserInternals.h pattern.h relaxng.h schemasInternals.h threads.h tree.h uri.h valid.h xinclude.h xlink.h xmlIO.h xmlautomata.h xmlerror.h xmlexports.h xmlmemory.h xmlreader.h xmlregexp.h xmlschemas.h xmlschemastypes.h xmlstring.h xmlunicode.h xmlversion.h xmlwriter.h xpath.h xpathInternals.h xpointer.h"
do_stage () {
- oe_soinstall .libs/${libname} ${STAGING_LIBDIR}/
- install -m 0644 .libs/libxml2.lai ${STAGING_LIBDIR}/libxml2.la
- install -m 0644 .libs/libxml2.a ${STAGING_LIBDIR}/
+ oe_libinstall -so libxml2 ${STAGING_LIBDIR}
mkdir -p ${STAGING_INCDIR}/libxml2/libxml
for i in ${headers}; do
diff --git a/libxsettings-client/libxsettings-client0_0.12.oe b/libxsettings-client/libxsettings-client0_0.12.oe
index e69de29bb2..b7d77db79f 100644
--- a/libxsettings-client/libxsettings-client0_0.12.oe
+++ b/libxsettings-client/libxsettings-client0_0.12.oe
@@ -0,0 +1,24 @@
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "libgpewidget x11"
+PROVIDES = "libxsettings-client"
+
+inherit pkgconfig gpe
+
+SRC_URI = "ftp://gpe.handhelds.org/gpe/source/libxsettings-client0-${PV}.tar.gz \
+ file://${FILESDIR}/make_pkgconfig_x11.patch;patch=1"
+
+headers = "xsettings-client.h"
+do_stage () {
+ oe_libinstall -so libXsettings-client ${STAGING_LIBDIR}
+ mkdir -p ${STAGING_INCDIR}
+ for h in ${headers}; do
+ install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
+ done
+}
+
+do_install () {
+ gpe_do_install
+ install -d ${D}/usr/include/
+ install xsettings-client.h ${D}/usr/include/
+}
diff --git a/libxsettings/libxsettings_0.11.oe b/libxsettings/libxsettings_0.11.oe
index e69de29bb2..9b9d0b435a 100644
--- a/libxsettings/libxsettings_0.11.oe
+++ b/libxsettings/libxsettings_0.11.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "Common code for XSETTINGS"
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "x11"
+
+inherit gpe
+
+SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/libxsettings-${PV}.tar.gz"
+
+headers = "xsettings-common.h"
+
+do_stage () {
+ oe_libinstall -so libXsettings ${STAGING_LIBDIR}
+
+ mkdir -p ${STAGING_INCDIR}/gpe
+ for h in ${headers}; do
+ install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
+ done
+}
+
+do_install () {
+ gpe_do_install
+ oe_runmake PREFIX=${prefix} DESTDIR=${D} install-devel
+}
diff --git a/lirc/lirc_0.6.6.oe b/lirc/lirc_0.6.6.oe
index b35b1c695f..b067507589 100644
--- a/lirc/lirc_0.6.6.oe
+++ b/lirc/lirc_0.6.6.oe
@@ -24,7 +24,7 @@ EXTRA_OECONF = "--with-kerneldir=${KERNEL_SOURCE} \
EXTRA_OEMAKE = 'SUBDIRS="daemons tools"'
do_stage() {
- oe_soinstall tools/.libs/liblirc_client.so.0.0.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so -C tools liblirc_client ${STAGING_LIBDIR}
install -m 0644 tools/lirc_client.h ${STAGING_INCDIR}/
}
diff --git a/lzo/lzo_1.08.oe b/lzo/lzo_1.08.oe
index 98c7e6601d..ab1cc2da83 100644
--- a/lzo/lzo_1.08.oe
+++ b/lzo/lzo_1.08.oe
@@ -27,6 +27,5 @@ do_stage() {
install -m 0644 include/lzoconf.h ${STAGING_INCDIR}/lzoconf.h
install -m 0644 include/lzoutil.h ${STAGING_INCDIR}/lzoutil.h
- oe_soinstall src/.libs/liblzo.so.1.0.0 ${STAGING_LIBDIR}/
- install -m 0644 src/.libs/liblzo.a ${STAGING_LIBDIR}/liblzo.a
+ oe_libinstall -a -so -C src liblzo ${STAGING_LIBDIR}
}
diff --git a/ncurses/ncurses_5.3.oe b/ncurses/ncurses_5.3.oe
index 8b83dfd584..45ef19f116 100644
--- a/ncurses/ncurses_5.3.oe
+++ b/ncurses/ncurses_5.3.oe
@@ -55,6 +55,6 @@ do_stage () {
done
ln -sf curses.h ${STAGING_INCDIR}/ncurses.h
for i in ncurses panel form menu; do
- oe_soinstall lib/lib$i.so.5.3 ${STAGING_LIBDIR}/
+ oe_libinstall -so -C lib $i ${STAGING_LIBDIR}
done
}
diff --git a/ncurses/ncurses_5.4.oe b/ncurses/ncurses_5.4.oe
index 4238d59e92..1bea072f70 100644
--- a/ncurses/ncurses_5.4.oe
+++ b/ncurses/ncurses_5.4.oe
@@ -38,8 +38,8 @@ do_configure () {
}
do_stage () {
- for i in ncurses panel form menu; do
- oe_soinstall lib/lib$i.so.${PV} ${STAGING_LIBDIR}/
+ for i in libncurses libpanel libform libmenu; do
+ oe_libinstall -so -C lib $i ${STAGING_LIBDIR}
done
for h in ncurses_*.h curses.h eti.h form.h menu.h panel.h \
termcap.h term.h unctrl.h; do
diff --git a/openjade/openjade-native_1.3.2.oe b/openjade/openjade-native_1.3.2.oe
index 656ee5582a..f60f221a64 100644
--- a/openjade/openjade-native_1.3.2.oe
+++ b/openjade/openjade-native_1.3.2.oe
@@ -18,16 +18,9 @@ do_configure () {
oe_runconf
}
-SOV = "0.0.1"
do_stage () {
install -m 0755 ${S}/jade/.libs/openjade ${STAGING_BINDIR}/openjade
- install -m 0755 ${S}/style/.libs/libostyle.lai ${STAGING_LIBDIR}/libostyle.la
- install -m 0755 ${S}/style/.libs/libostyle.a ${STAGING_LIBDIR}/libostyle.a
- oe_soinstall style/.libs/libostyle.so.${SOV} ${STAGING_LIBDIR}/
- install -m 0755 ${S}/spgrove/.libs/libospgrove.lai ${STAGING_LIBDIR}/libospgrove.la
- install -m 0755 ${S}/spgrove/.libs/libospgrove.a ${STAGING_LIBDIR}/libospgrove.a
- oe_soinstall spgrove/.libs/libospgrove.so.${SOV} ${STAGING_LIBDIR}/
- install -m 0755 ${S}/grove/.libs/libogrove.lai ${STAGING_LIBDIR}/libogrove.la
- install -m 0755 ${S}/grove/.libs/libogrove.a ${STAGING_LIBDIR}/libogrove.a
- oe_soinstall grove/.libs/libogrove.so.${SOV} ${STAGING_LIBDIR}/
+ oe_libinstall -a -so -C style libostyle ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C spgrove libospgrove ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C grove libogrove ${STAGING_LIBDIR}
}
diff --git a/openjade/openjade_1.3.2.oe b/openjade/openjade_1.3.2.oe
index 0f3b2129fd..0c6ff00c66 100644
--- a/openjade/openjade_1.3.2.oe
+++ b/openjade/openjade_1.3.2.oe
@@ -18,15 +18,8 @@ do_configure_prepend () {
mv config/configure.in .
}
-SOV = "0.0.1"
do_stage () {
- install -m 0755 ${S}/style/.libs/libostyle.lai ${STAGING_LIBDIR}/libostyle.la
- install -m 0755 ${S}/style/.libs/libostyle.a ${STAGING_LIBDIR}/libostyle.a
- oe_soinstall style/.libs/libostyle.so.${SOV} ${STAGING_LIBDIR}/
- install -m 0755 ${S}/spgrove/.libs/libospgrove.lai ${STAGING_LIBDIR}/libospgrove.la
- install -m 0755 ${S}/spgrove/.libs/libospgrove.a ${STAGING_LIBDIR}/libospgrove.a
- oe_soinstall spgrove/.libs/libospgrove.so.${SOV} ${STAGING_LIBDIR}/
- install -m 0755 ${S}/grove/.libs/libogrove.lai ${STAGING_LIBDIR}/libogrove.la
- install -m 0755 ${S}/grove/.libs/libogrove.a ${STAGING_LIBDIR}/libogrove.a
- oe_soinstall grove/.libs/libogrove.so.${SOV} ${STAGING_LIBDIR}/
+ oe_libinstall -a -so -C style libostyle ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C spgrove libospgrove ${STAGING_LIBDIR}
+ oe_libinstall -a -so -C grove libogrove ${STAGING_LIBDIR}
}
diff --git a/openobex/openobex_1.0.1.oe b/openobex/openobex_1.0.1.oe
index af0d67c499..8b98a0f96e 100644
--- a/openobex/openobex_1.0.1.oe
+++ b/openobex/openobex_1.0.1.oe
@@ -8,10 +8,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openobex/openobex-${PV}.tar.gz"
inherit autotools libtool
do_stage () {
- oe_soinstall src/.libs/libopenobex-1.0.so.1.0.0 ${STAGING_LIBDIR}/
- ln -sf libopenobex-1.0.so.1.0.0 ${STAGING_LIBDIR}/libopenobex.so
- install -m 0755 src/.libs/libopenobex.a ${STAGING_LIBDIR}/libopenobex.a
- install -m 0755 src/.libs/libopenobex.lai ${STAGING_LIBDIR}/libopenobex.la
+ oe_libinstall -a -so -C src libopenobex-1.0 ${STAGING_LIBDIR}
+ ln -sf libopenobex-1.0.so ${STAGING_LIBDIR}/libopenobex.so
install -d ${STAGING_INCDIR}/openobex
install -m 0644 src/obex_const.h src/obex.h ${STAGING_INCDIR}/openobex/
cat openobex-config | sed -e 's,/usr/include,${STAGING_INCDIR},g; \
diff --git a/opensp/opensp-native_1.5.oe b/opensp/opensp-native_1.5.oe
index c50f1a66dc..2c47f226ad 100644
--- a/opensp/opensp-native_1.5.oe
+++ b/opensp/opensp-native_1.5.oe
@@ -15,9 +15,7 @@ do_configure () {
}
do_stage () {
- install -m 0755 lib/.libs/libosp.a ${STAGING_LIBDIR}/libosp.so.a
- install -m 0755 lib/.libs/libosp.lai ${STAGING_LIBDIR}/libosp.la
- oe_soinstall lib/.libs/libosp.so.3.0.0 ${STAGING_LIBDIR}/
+ oe_libinstall -a -so -C lib libosp ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/OpenSP
install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/OpenSP/
install -m 0644 ${S}/include/*.cxx ${STAGING_INCDIR}/OpenSP/
diff --git a/opensp/opensp_1.5.oe b/opensp/opensp_1.5.oe
index 3daf49d6f6..936c034b31 100644
--- a/opensp/opensp_1.5.oe
+++ b/opensp/opensp_1.5.oe
@@ -11,9 +11,7 @@ S = "${WORKDIR}/OpenSP-${PV}"
inherit autotools libtool
do_stage () {
- install -m 0755 lib/.libs/libosp.a ${STAGING_LIBDIR}/libosp.so.a
- install -m 0755 lib/.libs/libosp.lai ${STAGING_LIBDIR}/libosp.la
- oe_soinstall lib/.libs/libosp.so.3.0.0 ${STAGING_LIBDIR}/
+ oe_libinstall -a -so -C lib libosp ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/OpenSP
install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/OpenSP/
install -m 0644 ${S}/include/*.cxx ${STAGING_INCDIR}/OpenSP/
diff --git a/openssl/openssl_0.9.7b.oe b/openssl/openssl_0.9.7b.oe
index ce88c79745..47c1c07d69 100644
--- a/openssl/openssl_0.9.7b.oe
+++ b/openssl/openssl_0.9.7b.oe
@@ -34,8 +34,8 @@ do_compile () {
do_stage () {
cp --dereference -R include/openssl ${STAGING_INCDIR}/
- oe_soinstall libcrypto.so.0.9.7 ${STAGING_LIBDIR}/
- oe_soinstall libssl.so.0.9.7 ${STAGING_LIBDIR}/
+ oe_libinstall -so libcrypto ${STAGING_LIBDIR}
+ oe_libinstall -so libssl ${STAGING_LIBDIR}
}
do_install () {
diff --git a/openssl/openssl_0.9.7c.oe b/openssl/openssl_0.9.7c.oe
index 526f42513b..a37ad9a43b 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}/
- 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}/
+ oe_libinstall -a -so libcrypto ${STAGING_LIBDIR}
+ oe_libinstall -a -so libssl ${STAGING_LIBDIR}
}
do_install () {
diff --git a/openssl/openssl_0.9.7d.oe b/openssl/openssl_0.9.7d.oe
index e69de29bb2..c65bf4b94e 100644
--- a/openssl/openssl_0.9.7d.oe
+++ b/openssl/openssl_0.9.7d.oe
@@ -0,0 +1,45 @@
+DEPENDS = "virtual/libc"
+SECTION = "libs"
+DESCRIPTION = "Secure Socket Layer (SSL) binary and related cryptographic tools."
+
+SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz"
+S = "${WORKDIR}/openssl-${PV}"
+
+AR_append = " r"
+export CFLAG = "-fPIC -DTHREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -DL_ENDIAN -DTERMIO -Wall ${FULL_OPTIMIZATION}"
+export DIRS = "crypto ssl"
+export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}"
+
+do_compile () {
+ perl util/perlpath.pl ${bindir}
+ ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
+ if test "X${TARGET_OS}" = "Xlinux"; then
+ target=${TARGET_OS}-elf
+ else
+ target=${TARGET_OS}
+ fi
+ if ! test "X${BUILD_SYS}" = "X${TARGET_SYS}" -o \
+ "X${TARGET_ARCH}" = "Xi386" -o \
+ "X${TARGET_ARCH}" = "Xi686" -o \
+ "X${TARGET_ARCH}" = "Xi586" -o \
+ "X${TARGET_ARCH}" = "Xi486"; then
+ target="$target-${TARGET_ARCH}"
+ fi
+ perl ./Configure shared --prefix=${prefix} --openssldir=${libdir}/ssl $target
+ oe_runmake -f Makefile.ssl
+ perl ./Configure no-shared --prefix=${prefix} --openssldir=${libdir}/ssl $target
+ oe_runmake -f Makefile.ssl
+}
+
+do_stage () {
+ cp --dereference -R include/openssl ${STAGING_INCDIR}/
+ oe_libinstall -a -so libcrypto ${STAGING_LIBDIR}
+ oe_libinstall -a -so libssl ${STAGING_LIBDIR}
+}
+
+do_install () {
+ install -d ${D}/${libdir}/pkgconfig
+ oe_runmake -f Makefile.ssl INSTALL_PREFIX="${D}" install
+ chmod u+rx ${D}/${libdir}/pkgconfig
+ chmod 644 ${D}/${libdir}/pkgconfig/openssl.pc
+}
diff --git a/opie-camera/opie-camera_1.0.1.oe b/opie-camera/opie-camera_1.0.1.oe
index aee94e9b70..00eedad3ce 100644
--- a/opie-camera/opie-camera_1.0.1.oe
+++ b/opie-camera/opie-camera_1.0.1.oe
@@ -1,7 +1,7 @@
DESCRIPTION = "Opie Camera, Photo and Video Capturing Application for the Sharp CF-AG06 camera"
SECTION = "opie/applications"
PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>"
LICENSE = "GPL"
DEPENDS = "libopie2"
APPNAME = "camera"
@@ -21,7 +21,7 @@ inherit opie
do_install() {
install -d ${D}/${palmtopdir}/pics/${APPNAME}
install -d ${D}/${palmtopdir}/lib/
- oe_soinstall libcamera.so.1.0.1 ${D}/${palmtopdir}/lib/
+ oe_libinstall -so libcamera ${D}/${palmtopdir}/lib
install -m 0755 capture ${D}/${palmtopdir}/bin/
install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}/${palmtopdir}/pics/${APPNAME}/
}
diff --git a/opie-ftplib/opie-ftplib_cvs.oe b/opie-ftplib/opie-ftplib_cvs.oe
index 2a4c14aac2..7ebe404615 100644
--- a/opie-ftplib/opie-ftplib_cvs.oe
+++ b/opie-ftplib/opie-ftplib_cvs.oe
@@ -1,6 +1,6 @@
DESCRIPTION = "Opie FTP Library"
SECTION = "opie/libs"
-MAINTAINER = "Team Opie <opie@handhelds.org>
+MAINTAINER = "Team Opie <opie@handhelds.org>"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "virtual/libc"
@@ -16,10 +16,9 @@ EXTRA_QMAKEVARS_POST = "DESTDIR=${S}"
do_stage () {
install -m 0664 ${S}/ftplib.h ${STAGING_INCDIR}/
- oe_soinstall libftplib.so.1.0.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so libftplib.so ${STAGING_LIBDIR}
}
do_install() {
- install -d ${D}/${palmtopdir}/lib/
- oe_soinstall libftplib.so.1.0.0 ${D}${palmtopdir}/lib/
+ oe_libinstall -so libftplib ${D}/${palmtopdir}/lib
}
diff --git a/pango/pango_1.2.5.oe b/pango/pango_1.2.5.oe
index b37a33e8e3..64255ac34d 100644
--- a/pango/pango_1.2.5.oe
+++ b/pango/pango_1.2.5.oe
@@ -15,14 +15,11 @@ EXTRA_OECONF = "--disable-glibtest \
FILES_${PN} = "/etc ${bindir} ${libdir}/libpango*.so.*"
-SOV = "0.200.5"
LIBV = "1.2.0"
do_stage () {
for lib in pango pangox pangoft2 pangoxft; do
- oe_soinstall pango/.libs/lib$lib-1.0.so.${SOV} ${STAGING_LIBDIR}/
- install -m 0644 pango/.libs/lib$lib-1.0.lai ${STAGING_LIBDIR}/lib$lib-1.0.la
- install -m 0644 pango/.libs/lib$lib-1.0.a ${STAGING_LIBDIR}/
+ oe_libinstall -a -so -C pango $lib-1.0 ${STAGING_LIBDIR}
done
install -d ${STAGING_INCDIR}/pango
install -m 0644 ${S}/pango/pango*.h ${STAGING_INCDIR}/pango/
diff --git a/pcre/pcre_4.4.oe b/pcre/pcre_4.4.oe
index 173a3eeef9..29067ab6bb 100644
--- a/pcre/pcre_4.4.oe
+++ b/pcre/pcre_4.4.oe
@@ -23,13 +23,8 @@ do_compile () {
}
do_stage () {
- oe_soinstall .libs/libpcreposix.so.0.0.0 ${STAGING_LIBDIR}/
- install -m 0644 .libs/libpcreposix.a ${STAGING_LIBDIR}/
- install -m 0644 .libs/libpcreposix.lai ${STAGING_LIBDIR}/libpcreposix.la
- oe_soinstall .libs/libpcre.so.0.0.1 ${STAGING_LIBDIR}/
- install -m 0644 .libs/libpcre.a ${STAGING_LIBDIR}/
- install -m 0644 .libs/libpcre.lai ${STAGING_LIBDIR}/libpcre.la
-
+ oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR}
+ oe_libinstall -a -so libpcre ${STAGING_LIBDIR}
install -m 0644 pcre.h ${STAGING_INCDIR}/
install -m 0644 pcreposix.h ${STAGING_INCDIR}/
}
diff --git a/pme/pme_1.0.3.oe b/pme/pme_1.0.3.oe
index 45e0946469..54014424ac 100644
--- a/pme/pme_1.0.3.oe
+++ b/pme/pme_1.0.3.oe
@@ -5,8 +5,6 @@ SRC_URI = "http://xaxxon.slackworks.com/pme/pme-${PV}.tar.gz"
inherit autotools libtool
do_stage () {
- oe_soinstall .libs/libpme.so.0.0.0 ${STAGING_LIBDIR}/
- install -m 0644 .libs/libpme.a ${STAGING_LIBDIR}/libpme.a
- install -m 0644 .libs/libpme.lai ${STAGING_LIBDIR}/libpme.la
+ oe_libinstall -a -so libpme ${STAGING_LIBDIR}
install -m 0644 pme.h ${STAGING_INCDIR}/
}
diff --git a/popt/popt_1.7.oe b/popt/popt_1.7.oe
index c3cc5cd06b..3950184066 100644
--- a/popt/popt_1.7.oe
+++ b/popt/popt_1.7.oe
@@ -8,8 +8,6 @@ SRC_URI = "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-${PV}.tar.gz \
inherit autotools libtool
do_stage () {
- oe_soinstall .libs/libpopt.so.0.0.0 ${STAGING_LIBDIR}/
- install -m 0644 .libs/libpopt.a ${STAGING_LIBDIR}/
- install -m 0644 .libs/libpopt.lai ${STAGING_LIBDIR}/libpopt.la
+ oe_libinstall -a -so libpopt ${STAGING_LIBDIR}
install -m 0644 popt.h ${STAGING_INCDIR}/
}
diff --git a/portaudio/portaudio_0.0.19.oe b/portaudio/portaudio_0.0.19.oe
index 4c4467fc4e..e25f34c79b 100644
--- a/portaudio/portaudio_0.0.19.oe
+++ b/portaudio/portaudio_0.0.19.oe
@@ -13,7 +13,7 @@ inherit autotools libtool pkgconfig
EXTRA_OECONF = "--with-jack=no"
do_stage() {
- oe_soinstall lib/libportaudio.so.${PV} ${STAGING_LIBDIR}/
+ oe_libinstall -so -C lib libportaudio ${STAGING_LIBDIR}
install -m 0644 pa_common/portaudio.h ${STAGING_INCDIR}/portaudio.h
}
diff --git a/pth/pth_2.0.0.oe b/pth/pth_2.0.0.oe
index c027fa19d5..de17a53a69 100644
--- a/pth/pth_2.0.0.oe
+++ b/pth/pth_2.0.0.oe
@@ -13,7 +13,7 @@ do_configure() {
}
do_stage() {
- oe_soinstall .libs/libpth.so.20.0.20 ${STAGING_LIBDIR}/
+ oe_libinstall -so libpth ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/
for X in pth.h
diff --git a/python/python-pyqt_3.11.oe b/python/python-pyqt_3.11.oe
index cab48a25e2..1c69dec5bb 100644
--- a/python/python-pyqt_3.11.oe
+++ b/python/python-pyqt_3.11.oe
@@ -65,10 +65,10 @@ do_stage() {
do_install() {
install -d ${D}/${libdir}/python2.3/site-packages/
- oe_soinstall ${STAGING_LIBDIR}/python2.3/site-packages/libsip.so.11.0.1 ${D}/${libdir}/python2.3/site-packages/
+ oe_libinstall -so -C ${STAGING_LIBDIR}/python2.3/site-packages libsip ${D}/${libdir}/python2.3/site-packages
for module in ${MODULES}
do
- oe_soinstall ${STAGING_LIBDIR}/python2.3/site-packages/lib${module}cmodule.so.1.0.0 ${D}/${libdir}/python2.3/site-packages/
+ oe_libinstall -so -C ${STAGING_LIBDIR}/python2.3/site-packages lib${module}cmodule ${D}/${libdir}/python2.3/site-packages
install -m 0644 ${module}/${module}.py ${D}/${libdir}/python2.3/site-packages/
done
}
diff --git a/python/python-pyqwt_3.10.oe b/python/python-pyqwt_3.10.oe
index 645a5852e6..f75ab692f2 100644
--- a/python/python-pyqwt_3.10.oe
+++ b/python/python-pyqwt_3.10.oe
@@ -80,7 +80,7 @@ do_install() {
install -m 0644 ${S}/qwt/*.py ${D}/${libdir}/python2.3/site-packages/qwt/
for module in ${MODULES}
do
- oe_soinstall ${STAGING_LIBDIR}/python2.3/site-packages/lib${module}cmodule.so.1.0.0 ${D}/${libdir}/python2.3/site-packages/
+ oe_libinstall -so -C ${STAGING_LIBDIR}/python2.3/site-packages lib${module}cmodule ${D}/${libdir}/python2.3/site-packages/
done
}
diff --git a/qplot/qplot_2.0.1cvs.oe b/qplot/qplot_2.0.1cvs.oe
index fff9afaff3..2ba5f9730f 100644
--- a/qplot/qplot_2.0.1cvs.oe
+++ b/qplot/qplot_2.0.1cvs.oe
@@ -6,22 +6,21 @@ LICENSE = "GPL"
DEPENDS = "virtual/libc"
SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/qplot;module=qplot \
- file://${FILESDIR}/gcc3.patch;patch=1"
+ file://${FILESDIR}/gcc3.patch;patch=1"
S = "${WORKDIR}/qplot"
inherit palmtop
do_install() {
- install -d ${D}/${palmtopdir}/bin \
- ${D}/${palmtopdir}/apps/Applications \
- ${D}/${palmtopdir}/pics \
- ${D}/${palmtopdir}/lib \
- ${D}/${palmtopdir}/plugins/inputmethods
+ install -d ${D}/${palmtopdir}/bin \
+ ${D}/${palmtopdir}/apps/Applications \
+ ${D}/${palmtopdir}/pics \
+ ${D}/${palmtopdir}/lib \
+ ${D}/${palmtopdir}/plugins/inputmethods
install -m 755 qplotmain/qplot ${D}/${palmtopdir}/bin/qplot
install -m 644 qplotmain/qplot.png ${D}/${palmtopdir}/pics/
install -m 644 qplotmain/qplot-const.b ${D}/${palmtopdir}/lib/
install -m 644 qplotmain/qplot-math.b ${D}/${palmtopdir}/lib/
- oe_soinstall qplotmath/libqplotmath.so.1.0.0 ${D}/${palmtopdir}/plugins/inputmethods/
+ oe_libinstall -so -C qplotmath libqplotmath ${D}/${palmtopdir}/plugins/inputmethods/
install -m 644 qplot.desktop ${D}/${palmtopdir}/apps/Applications/qplot.desktop
}
-
diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe
index 06da21cd20..19166c1b99 100644
--- a/qte/qte_2.3.7.oe
+++ b/qte/qte_2.3.7.oe
@@ -57,14 +57,14 @@ do_compile() {
}
do_stage() {
- oe_soinstall lib/libqte.so.${PV} ${STAGING_LIBDIR}
+ oe_libinstall -so -C lib libqte ${STAGING_LIBDIR}
rm -f include/qxt.h
cp -pfLR include/* ${STAGING_INCDIR}/
}
do_install() {
install -d ${D}${palmtopdir}/lib/fonts
- oe_soinstall lib/libqte.so.${PV} ${D}${palmtopdir}/lib
+ oe_libinstall -so -C lib libqte ${D}/${palmtopdir}/lib
cp -a lib/fonts/* ${D}${palmtopdir}/lib/fonts/
}
diff --git a/qte/qte_2.3.8-snap.oe b/qte/qte_2.3.8-snap.oe
index 5f5b7055f8..82be6e15f1 100644
--- a/qte/qte_2.3.8-snap.oe
+++ b/qte/qte_2.3.8-snap.oe
@@ -59,12 +59,11 @@ do_compile() {
}
do_stage () {
- oe_soinstall lib/libqte.so.${PV} ${STAGING_LIBDIR}
+ oe_libinstall -so -C lib libqte ${STAGING_LIBDIR}
rm -f include/qxt.h
cp -pfLR include/* ${STAGING_INCDIR}/
}
do_install () {
- install -d ${D}${libdir}/qte2/lib
- install -m 0755 lib/libqte.so.* ${D}${libdir}/qte2/lib/
+ oe_libinstall -so -C lib libqte ${D}/${palmtopdir}/lib
}
diff --git a/qwt/qwt_4.2.0rc1.oe b/qwt/qwt_4.2.0rc1.oe
index fc9881da4d..64fec3d049 100644
--- a/qwt/qwt_4.2.0rc1.oe
+++ b/qwt/qwt_4.2.0rc1.oe
@@ -12,14 +12,14 @@ inherit qmake
EXTRA_QMAKEVARS_POST = "CONFIG-=thread"
do_stage() {
- oe_soinstall lib/libqwt.so.4.2.0 ${STAGING_LIBDIR}
+ oe_libinstall -so -C lib libqwt ${STAGING_LIBDIR}
cp -a include/* ${STAGING_INCDIR}
}
do_install() {
install -d ${D}/${libdir} \
${D}/${includedir}
- oe_soinstall lib/libqwt.so.4.2.0 ${D}/${libdir}
+ oe_libinstall -so -C lib libqwt ${D}/${libdir}
cp -a include/* ${D}/${includedir}
}
diff --git a/readline/readline_4.3.oe b/readline/readline_4.3.oe
index bb118deb43..acf703f885 100644
--- a/readline/readline_4.3.oe
+++ b/readline/readline_4.3.oe
@@ -13,8 +13,8 @@ SRC_URI = "ftp://ftp.cwru.edu/pub/bash/readline-${PV}.tar.gz \
inherit autotools libtool
do_stage() {
- oe_soinstall shlib/libhistory.so.${PV} ${STAGING_LIBDIR}/
- oe_soinstall shlib/libreadline.so.${PV} ${STAGING_LIBDIR}/
+ oe_libinstall -so -C shlib libhistory ${STAGING_LIBDIR}
+ oe_libinstall -so -C shlib libreadline ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/readline
for f in readline.h chardefs.h keymaps.h history.h tilde.h rlstdc.h \
diff --git a/slang/slang_1.4.9.oe b/slang/slang_1.4.9.oe
index bd05aa9e23..91a38ad2c7 100644
--- a/slang/slang_1.4.9.oe
+++ b/slang/slang_1.4.9.oe
@@ -26,8 +26,8 @@ do_compile () {
}
do_stage () {
- oe_soinstall src/elfobjs/libslang.so.${PV} ${STAGING_LIBDIR}/
- install -m 0644 src/objs/libslang.a ${STAGING_LIBDIR}/
+ oe_libinstall -so -C src/elfobjs libslang ${STAGING_LIBDIR}
+ oe_libinstall -a -C src/objs libslang ${STAGING_LIBDIR}
install -m 0644 src/slang.h ${STAGING_INCDIR}
install -m 0644 src/slcurses.h ${STAGING_INCDIR}
}
diff --git a/slotsig/slotsig_0.4.oe b/slotsig/slotsig_0.4.oe
index d0892ae84d..f3bdf4dd4b 100644
--- a/slotsig/slotsig_0.4.oe
+++ b/slotsig/slotsig_0.4.oe
@@ -12,7 +12,7 @@ do_compile() {
}
do_stage() {
- oe_soinstall libslotsig.so.${PV} ${STAGING_LIBDIR}/
+ oe_libinstall -so libslotsig ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/slotsig/
for X in slotsig/*.h
@@ -22,7 +22,5 @@ do_stage() {
}
do_install() {
- install -d ${D}${libdir}/
- oe_soinstall libslotsig.so.${PV} ${D}${libdir}/
+ oe_libinstall -so libslotsig ${D}/${libdir}
}
-
diff --git a/smpeg/smpeg_0.4.4+0.4.5cvs20040311.oe b/smpeg/smpeg_0.4.4+0.4.5cvs20040311.oe
index c16bae1f21..d16cd51f97 100644
--- a/smpeg/smpeg_0.4.4+0.4.5cvs20040311.oe
+++ b/smpeg/smpeg_0.4.4+0.4.5cvs20040311.oe
@@ -21,13 +21,13 @@ EXTRA_OECONF = "--disable-gtktest --disable-opengl-player --without-x \
--with-sdl-exec-prefix=${STAGING_BINDIR}/.."
do_configure_prepend () {
- touch NEWS AUTHORS ChangeLog
- rm -f acinclude.m4
+ touch NEWS AUTHORS ChangeLog
+ rm -f acinclude.m4
}
do_stage() {
- oe_soinstall .libs/libsmpeg-0.4.so.0.1.4 ${STAGING_LIBDIR}
- ln -sf libsmpeg-0.4.so.0.1.4 ${STAGING_LIBDIR}/libsmpeg.so
+ oe_libinstall libsmpeg-0.4 ${STAGING_LIBDIR}
+ ln -sf libsmpeg-0.4.so ${STAGING_LIBDIR}/libsmpeg.so
for f in "*.h"
do
diff --git a/sqlite/sqlite_2.8.9.oe b/sqlite/sqlite_2.8.9.oe
index c671761e22..8fd623fbf7 100644
--- a/sqlite/sqlite_2.8.9.oe
+++ b/sqlite/sqlite_2.8.9.oe
@@ -22,7 +22,7 @@ do_compile () {
}
do_stage() {
- oe_soinstall .libs/libsqlite.so.0.8.6 ${STAGING_LIBDIR}
+ oe_libinstall -so libsqlite ${STAGING_LIBDIR}
install -m 0644 sqlite.h ${STAGING_INCDIR}
}
diff --git a/subapplet/subapplet_1.0.8.oe b/subapplet/subapplet_1.0.8.oe
index e69de29bb2..2a836b3f9c 100644
--- a/subapplet/subapplet_1.0.8.oe
+++ b/subapplet/subapplet_1.0.8.oe
@@ -0,0 +1,19 @@
+DESCRIPTION = "A secondary system tray for those people who like having a lot of applets loaded at once."
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "virtual/libc"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/subapplet/subapplet-1.0.8.tar.gz \
+ file://${FILESDIR}/subapplet.pro.patch;patch=1 "
+S = "${WORKDIR}/SubApplet-1.0.8"
+
+inherit palmtop
+
+QMAKE_PROFILES = "subapplet.pro"
+
+do_install() {
+ install -d ${D}/${palmtopdir}/plugins/applets ${D}/${palmtopdir}/pics/subapplet/
+ install -m 0644 *.png ${D}/${palmtopdir}/pics/subapplet/
+ oe_libinstall -so -C rel${palmtopdir}/plugins/applets libsubapplet ${D}/${palmtopdir}/plugins/applets/
+}
diff --git a/sword/sword_1.5.7.oe b/sword/sword_1.5.7.oe
index e69de29bb2..873394771a 100644
--- a/sword/sword_1.5.7.oe
+++ b/sword/sword_1.5.7.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "The SWORD Project is an open source, cross-platform (Linux, Windows, Solaris, MacOSX etc.) API and library for \
+Bible software with a constantly growing list of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 text modules"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "virtual/libc clucene curl"
+RDEPENDS = "clucene curl"
+PR = "2"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/s/sword/sword_${PV}.orig.tar.gz \
+ ${DEBIAN_MIRROR}/main/s/sword/sword_${PV}-${PR}.diff.gz;patch=1"
+
+inherit autotools libtool
+
+do_stage() {
+ oe_libinstall -so -C lib libsword ${STAGING_LIBDIR}
+
+ install -d ${STAGING_INCDIR}/
+ for f in include/*.h
+ do
+ install -m 0644 $f ${STAGING_INCDIR}/
+ done
+
+}
diff --git a/t1lib/t1lib_5.0.0.oe b/t1lib/t1lib_5.0.0.oe
index 820a5cdd36..2f3740ab7d 100644
--- a/t1lib/t1lib_5.0.0.oe
+++ b/t1lib/t1lib_5.0.0.oe
@@ -18,8 +18,7 @@ do_configure() {
}
do_stage() {
- oe_soinstall lib/.libs/libt1.so.5.0.0 ${STAGING_LIBDIR}/
- oe_soinstall lib/.libs/libt1.so.5.0.0 ${STAGING_LIBDIR}/
+ oe_libinstall -so -C lib libt1 ${STAGING_LIBDIR}
install lib/t1lib/t1lib.h ${STAGING_INCDIR}/
install lib/t1lib/t1libx.h ${STAGING_INCDIR}/
}
diff --git a/t1lib/t1lib_5.0.1.oe b/t1lib/t1lib_5.0.1.oe
index 5de2311987..ec5518ed0f 100644
--- a/t1lib/t1lib_5.0.1.oe
+++ b/t1lib/t1lib_5.0.1.oe
@@ -18,8 +18,7 @@ do_configure() {
}
do_stage() {
- oe_soinstall lib/.libs/libt1.so.5.1.1 ${STAGING_LIBDIR}/
- oe_soinstall lib/.libs/libt1.so.5.1.1 ${STAGING_LIBDIR}/
+ oe_libinstall -so -C lib libt1 ${STAGING_LIBDIR}
install lib/t1lib/t1lib.h ${STAGING_INCDIR}/
install lib/t1lib/t1libx.h ${STAGING_INCDIR}/
}
diff --git a/tslib/tslib.oe b/tslib/tslib.oe
index cc8eed7858..02a0cbc62d 100644
--- a/tslib/tslib.oe
+++ b/tslib/tslib.oe
@@ -23,7 +23,7 @@ inherit autotools libtool
EXTRA_OECONF = "--enable-shared"
do_stage () {
- oe_soinstall src/.libs/libts-0.0.so.0.1.0 ${STAGING_LIBDIR}/
+ 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}/
diff --git a/x11/x11-cvs.oe b/x11/x11-cvs.oe
index 6c54055001..6516c1d1cb 100644
--- a/x11/x11-cvs.oe
+++ b/x11/x11-cvs.oe
@@ -31,8 +31,6 @@ do_stage() {
install -c -m 644 include/X11/Xutil.h ${STAGING_INCDIR}/X11/Xutil.h
install -c -m 644 include/X11/cursorfont.h ${STAGING_INCDIR}/X11/cursorfont.h
install -c -m 644 include/X11/region.h ${STAGING_INCDIR}/X11/region.h
-
- 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
+
+ oe_libinstall -a -so -C src libX11 ${STAGING_LIBDIR}
}
diff --git a/xmms-embedded/xmms-embedded_20040327.oe b/xmms-embedded/xmms-embedded_20040327.oe
index 9d176f875a..8d058eb8e1 100644
--- a/xmms-embedded/xmms-embedded_20040327.oe
+++ b/xmms-embedded/xmms-embedded_20040327.oe
@@ -35,14 +35,14 @@ do_install() {
install -m 0644 xmms/General/QPEgui/xmms.desktop ${D}/${palmtopdir}/apps/Applications/xmms.desktop
install -m 0644 ${FILESDIR}/xmms.png ${D}/${palmtopdir}/pics/xmms.png
install -m 0755 compiled/bin/xmms ${D}/${palmtopdir}/bin/xmms
- oe_soinstall compiled/libxmms.so.1.0.0 ${D}/${palmtopdir}/lib
- oe_soinstall compiled/xmms/General/libQPEgui.so.1.0.0 ${D}/${palmtopdir}/lib/xmms/General
- for f in libfixpvorbisplugin.so.1.0.0 libmplayer.so.1.0.0 libshorten.so.1.0.0 \
- libwav.so.1.0.0 libxmms-mad.so.1.0.0 libxmms-sid.so.1.0.0
+ oe_libinstall -so -C compiled libxmms ${D}/${palmtopdir}/lib
+ oe_libinstall -so -C compiled/xmms/General libQPEgui ${D}/${palmtopdir}/lib/xmms/General
+ for f in libfixpvorbisplugin libmplayer libshorten \
+ libwav libxmms-mad libxmms-sid
do
- oe_soinstall compiled/xmms/Input/${f} ${D}/${palmtopdir}/lib/xmms/Input
+ oe_libinstall -so -C compiled/xmms/Input $f ${D}/${palmtopdir}/lib/xmms/Input
done
- oe_soinstall compiled/xmms/Output/liboss.so.1.0.0 ${D}/${palmtopdir}/lib/xmms/Output
+ oe_libinstall -so -C compiled/xmms/Output liboss ${D}/${palmtopdir}/lib/xmms/Output
for f in eject.png fileadd.png main.png norep.png pause.png play.png rew.png \
shuf.png stop.png ff.png filedel.png move.png noshuf.png plalap.png \
rep.png save.png skinconf urladd.png
diff --git a/xpm/xpm-cvs.oe b/xpm/xpm-cvs.oe
index 2c0ad3d6a9..4773422918 100644
--- a/xpm/xpm-cvs.oe
+++ b/xpm/xpm-cvs.oe
@@ -13,7 +13,5 @@ inherit autotools pkgconfig libtool
do_stage () {
install -m 0644 ${S}/lib/xpm.h ${STAGING_INCDIR}/X11/xpm.h
- install -m 0644 lib/.libs/libXpm.a ${STAGING_LIBDIR}/libXpm.a
- install -m 0644 lib/.libs/libXpm.lai ${STAGING_LIBDIR}/libXpm.la
- oe_soinstall lib/.libs/libXpm.so.4.5.0 ${STAGING_LIBDIR}/
+ oe_libinstall -a -so -C lib libXpm ${STAGING_LIBDIR}
}
diff --git a/zlib/zlib_1.1.4.oe b/zlib/zlib_1.1.4.oe
index 659cb3ac3e..19adf8da78 100644
--- a/zlib/zlib_1.1.4.oe
+++ b/zlib/zlib_1.1.4.oe
@@ -21,8 +21,7 @@ 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.a ${STAGING_LIBDIR}/libz.a
- oe_soinstall libz.so.1.1.4 ${STAGING_LIBDIR}/
+ oe_libinstall -a -so libz ${STAGING_LIBDIR}
}
do_install() {
diff --git a/zziplib/zziplib_0.10.82.oe b/zziplib/zziplib_0.10.82.oe
index 00f044d753..27f93a97e1 100644
--- a/zziplib/zziplib_0.10.82.oe
+++ b/zziplib/zziplib_0.10.82.oe
@@ -8,10 +8,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/zziplib/zziplib-${PV}.tar.bz2"
inherit autotools libtool pkgconfig
do_stage() {
- oe_soinstall zzip/.libs/libzzip-0.so.10.0.82 ${STAGING_LIBDIR}
- ln -sf libzzip-0.so.10.0.82 ${STAGING_LIBDIR}/libzzip.so
- oe_soinstall zzipwrap/.libs/libzzipwrap-0.so.10.0.82 ${STAGING_LIBDIR}
- ln -sf libzzipwrap-0.so.10.0.82 ${STAGING_LIBDIR}/libzzipwrap.so
+ oe_libinstall -a -so libzzip-0 ${STAGING_LIBDIR}
+ ln -sf libzzip-0.so ${STAGING_LIBDIR}/libzzip.so
+ oe_libinstall -a -so -C zzipwarp libzzipwrap-0 ${STAGING_LIBDIR}
+ ln -sf libzzipwrap-0.so ${STAGING_LIBDIR}/libzzipwrap.so
install -d ${STAGING_INCDIR}/readline
for f in readline.h chardefs.h keymaps.h history.h tilde.h rlstdc.h \