aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qtopia
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-07-24 18:59:53 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2011-07-30 02:39:41 +0100
commitcf636a600c533b81aac2f3c2d8b467cfe455f809 (patch)
tree8bc1bfb1fdde30ba0e38db56e3b1dc4815810b58 /recipes-qtopia
parenta4fadc1bbd4f8956e7b4b4f218809dc8effbcd76 (diff)
downloadmeta-opie-cf636a600c533b81aac2f3c2d8b467cfe455f809.tar.gz
meta-opie-cf636a600c533b81aac2f3c2d8b467cfe455f809.tar.bz2
meta-opie-cf636a600c533b81aac2f3c2d8b467cfe455f809.zip
kdepimpi: remove legacy staging
Also remove comments from multi-line strings. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'recipes-qtopia')
-rw-r--r--recipes-qtopia/kdepimpi/kdepimpi-base.inc24
-rw-r--r--recipes-qtopia/kdepimpi/kdepimpi-qte.inc35
-rw-r--r--recipes-qtopia/kdepimpi/pwmpi.inc9
3 files changed, 13 insertions, 55 deletions
diff --git a/recipes-qtopia/kdepimpi/kdepimpi-base.inc b/recipes-qtopia/kdepimpi/kdepimpi-base.inc
index d031a52..c12ff60 100644
--- a/recipes-qtopia/kdepimpi/kdepimpi-base.inc
+++ b/recipes-qtopia/kdepimpi/kdepimpi-base.inc
@@ -42,12 +42,12 @@ SUBDIRS="qtcompat libical/src/libical libical/src/libicalss microkde libkcal lib
kabc/formats/binary kabc/plugins/qtopia \
gammu/emb/common \
gammu/emb/gammu \
+ "
# pwmanager/libcrypt/mpi \
# pwmanager/libcrypt/error \
# pwmanager/libcrypt/cipher \
# pwmanager/libcrypt/zlib \
# pwmanager/pwmanager \
- "
inherit palmtop
@@ -93,22 +93,6 @@ do_unstage() {
done
}
-addtask unstage before do_configure
-
-do_stage() {
-
- for dir in ${HEADERS_DIRS};
- do
- install -d ${STAGING_INCDIR}/kdepimpi/$dir
- install -m 0644 ${S}/$dir/*.h ${STAGING_INCDIR}/kdepimpi/$dir/
- done
-
- for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
- do
- oe_libinstall -so -C ${S}/dest/ $f ${STAGING_LIBDIR}/kdepimpi/
- done
-}
-
do_install() {
install -d ${D}${bindir} \
${D}${palmtopdir}/lib \
@@ -136,6 +120,12 @@ do_install() {
oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/lib
done
+ for dir in ${HEADERS_DIRS};
+ do
+ install -d ${D}${includedir}/kdepimpi/$dir
+ install -m 0644 ${S}/$dir/*.h ${D}${includedir}/kdepimpi/$dir/
+ done
+
install -m 0755 ${S}/dest/kopi ${D}${bindir}/kopi
install -m 0755 ${S}/dest/kapi ${D}${bindir}/kapi
diff --git a/recipes-qtopia/kdepimpi/kdepimpi-qte.inc b/recipes-qtopia/kdepimpi/kdepimpi-qte.inc
index da7f011..07f2903 100644
--- a/recipes-qtopia/kdepimpi/kdepimpi-qte.inc
+++ b/recipes-qtopia/kdepimpi/kdepimpi-qte.inc
@@ -81,35 +81,6 @@ kabc \
libkcal \
libkdepim "
-do_unstage() {
-
- for dir in ${HEADERS_DIRS};
- do
- rm -rf ${STAGING_INCDIR}/kdepimpi/$dir
- done
-
- for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
- do
- rm -f ${STAGING_LIBDIR}/kdepimpi/$f*
- done
-}
-
-addtask unstage before do_configure
-
-do_stage() {
-
- for dir in ${HEADERS_DIRS};
- do
- install -d ${STAGING_INCDIR}/kdepimpi/$dir
- install -m 0644 ${S}/$dir/*.h ${STAGING_INCDIR}/kdepimpi/$dir/
- done
-
- for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
- do
- oe_libinstall -so -C ${S}/dest/ $f ${STAGING_LIBDIR}/kdepimpi/
- done
-}
-
do_install() {
install -d ${D}${palmtopdir}/bin \
${D}${palmtopdir}/lib \
@@ -137,6 +108,12 @@ do_install() {
oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/lib
done
+ for dir in ${HEADERS_DIRS};
+ do
+ install -d ${D}${includedir}/kdepimpi/$dir
+ install -m 0644 ${S}/$dir/*.h ${D}${includedir}/kdepimpi/$dir/
+ done
+
install -m 0755 ${S}/dest/kopi ${D}${palmtopdir}/bin/kopi
install -m 0755 ${S}/dest/kapi ${D}${palmtopdir}/bin/kapi
diff --git a/recipes-qtopia/kdepimpi/pwmpi.inc b/recipes-qtopia/kdepimpi/pwmpi.inc
index 9e3cd8e..f203a7e 100644
--- a/recipes-qtopia/kdepimpi/pwmpi.inc
+++ b/recipes-qtopia/kdepimpi/pwmpi.inc
@@ -13,15 +13,6 @@ INCLUDEPATH+=${STAGING_INCDIR}/kdepimpi/ \
LIBS+=-L${STAGING_LIBDIR}/kdepimpi/ \
"
-do_configure_prepend() {
-}
-
-do_stage() {
-}
-
-do_unstage() {
-}
-
do_install() {
install -d ${D}${bindir} \
${D}${palmtopdir}/apps/Applications \