From 2bbcacb70e3ac67ab7a2ec7bace5f91c2560f635 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Sun, 9 May 2004 03:00:50 +0000 Subject: Merge openembedded@openembedded.bkbits.net:packages into linux.local:/home/kergoth/code/packages 2004/05/08 23:00:41-04:00 local!kergoth Upgrade the alsa packages to 1.0.4. 2004/05/08 22:17:13-04:00 local!kergoth Fix compile error with adns, resulting from a function definition not matching the declaration. 2004/05/08 18:00:51-04:00 local!kergoth Merge openembedded@openembedded.bkbits.net:packages into linux.local:/home/kergoth/code/packages 2004/05/08 13:59:20-04:00 local!kergoth Merge openembedded@openembedded.bkbits.net:packages into linux.local:/home/kergoth/code/packages 2004/05/08 13:59:15-04:00 local!kergoth Fixing up the libtool-native/libtool-cross mess. 2004/05/08 13:59:04-04:00 local!kergoth Bugfix in ncurses usage of oe_libinstall. 2004/05/07 21:46:16-04:00 local!kergoth Merge 2004/05/07 21:45:26-04:00 local!kergoth Adapt some .oe's to use oe_libinstall. BKrev: 409d9ee2NnxGHPWH0kUIfg5f6DoPcQ --- libmatchbox/libmatchbox_1.1.oe | 5 +---- libmatchbox/libmatchbox_1.2.oe | 7 +------ 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'libmatchbox') 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} } -- cgit v1.2.3