Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/03 14:22:58+01:00 uni-frankfurt.de!mickeyl
make libqtaux inherit opie

BKrev: 420225bcy3l9nLfi4gJxNyRPGgGJvQ

diff --git a/packages/libqtaux/libqtaux2_1.1.9.bb b/packages/libqtaux/libqtaux2_1.1.9.bb
index 2ec3f7c..fd48dbd 100644 (file)
--- a/packages/libqtaux/libqtaux2_1.1.9.bb
+++ b/packages/libqtaux/libqtaux2_1.1.9.bb
@@ -4,14 +4,12 @@ SECTION = "opie/libs"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libqtaux"
 S = "${WORKDIR}/libqtaux"
 
-inherit qmake
-
-EXTRA_QMAKEVARS_POST = 'DEFINES+=QWS'
+inherit opie
 
 do_compile() {
        install -d ${STAGING_INCDIR}/opie2

diff --git a/packages/libqtaux/libqtaux2_cvs.bb b/packages/libqtaux/libqtaux2_cvs.bb
index e69de29..03b484e 100644 (file)
--- a/packages/libqtaux/libqtaux2_cvs.bb
+++ b/packages/libqtaux/libqtaux2_cvs.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Qt/Embedded 2 Auxilliary libraries"
+HOMEPAGE = "http://opie.handhelds.org"
+SECTION = "opie/libs"
+PRIORITY = "optional"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+LICENSE = "GPL"
+PV = "1.1.7+cvs-${CVSDATE}"
+PR = "r1"
+
+SRC_URI = "${HANDHELDS_CVS};module=opie/libqtaux"
+S = "${WORKDIR}/libqtaux"
+
+inherit opie
+
+do_compile() {
+       install -d ${STAGING_INCDIR}/opie2
+       for i in `find . -name "*.h"`
+       do
+               install -m 0644 $i ${STAGING_INCDIR}/opie2/`basename $i`
+       done
+       oe_runmake MOC=${STAGING_BINDIR}/moc UIC=${STAGING_BINDIR}/uic DESTDIR=${S}
+}
+
+# no staging neessary, becaue
+# include files already done during do_compile
+# lib files already done during do_compile
+
+do_install() {
+       oe_libinstall -so -C ${STAGING_LIBDIR} libqtaux2 ${D}/${palmtopdir}/lib
+}
+
+FILES_${PN}=${palmtopdir}/lib
+