From cf636a600c533b81aac2f3c2d8b467cfe455f809 Mon Sep 17 00:00:00 2001
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Date: Sun, 24 Jul 2011 18:59:53 +0100
Subject: kdepimpi: remove legacy staging

Also remove comments from multi-line strings.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 recipes-qtopia/kdepimpi/kdepimpi-base.inc | 24 +++++++--------------
 recipes-qtopia/kdepimpi/kdepimpi-qte.inc  | 35 ++++++-------------------------
 recipes-qtopia/kdepimpi/pwmpi.inc         |  9 --------
 3 files changed, 13 insertions(+), 55 deletions(-)

(limited to 'recipes-qtopia')

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 \
-- 
cgit 1.2.3-korg