diff options
| author | Holger Freyther <zecke@selfish.org> | 2005-09-12 21:05:02 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-09-12 21:05:02 +0000 |
| commit | 22bdb20e75976fc26990920619e51166f5e4f9bc (patch) | |
| tree | 299fa49277b2482e1752b9e903d6228209ac12a9 | |
| parent | 172cdbd2ce755f0bd267c6721a016d180fbe4949 (diff) | |
packages/libopie:
opiebluez is part of libopie2 1.2.1 so fold back the changes
from _cvs.bb to libopie2.inc
| -rw-r--r-- | packages/libopie/libopie2.inc | 6 | ||||
| -rw-r--r-- | packages/libopie/libopie2_cvs.bb | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc index b19a71c1f9..4a05010dea 100644 --- a/packages/libopie/libopie2.inc +++ b/packages/libopie/libopie2.inc @@ -4,7 +4,7 @@ SECTION = "opie/libs" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "LGPL" I18N_FILES = "libopiecore2.ts libopiesecurity2.ts" -DEPENDS = "libqpe-opie libpcap sqlite3" +DEPENDS = "libqpe-opie libpcap sqlite3 bluez-libs" PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2" S = "${WORKDIR}/libopie2" @@ -23,8 +23,8 @@ EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \ #NOTE: We no longer enable the sqlite PIM backend here, since a) using it means no sync and b) it's too large for 16MB images EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=n' -MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui" -LIBS = "core2 db2 mm2 net2 pim2 security2 ui2" +MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui opiebluez" +LIBS = "core2 db2 mm2 net2 pim2 security2 ui2 bluez2" PRIVATE = "opimcontactsortvector.h opimoccurrence_p.h opimsortvector.h opimtodosortvector.h vobject_p.h opimeventsortvector.h" # uclibc doesn't have backtrace() diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index f45256ecd4..14d55f913b 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -1,10 +1,6 @@ include ${PN}.inc -DEPENDS += "bluez-libs" PV = "1.2.1+cvs-${CVSDATE}" -MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui opiebluez" -LIBS = "core2 db2 mm2 net2 pim2 security2 ui2 bluez2" - SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \ file://include.pro" |