fix include.pro and let opie-textedit make use of the new,

slightly more powerful opie.oeclass

BKrev: 40897c30rOKjbTTWOVIpQtXnS539Ug

diff --git a/libopie/libopie2/include.pro b/libopie/libopie2/include.pro
index e69de29..3fca1f7 100644 (file)
--- a/libopie/libopie2/include.pro
+++ b/libopie/libopie2/include.pro
@@ -0,0 +1,20 @@
+# we don't want to modify subdir .pro's
+!contains( TEMPLATE, subdirs ) {
+# if it's already a lib, we ignore it
+!contains( TEMPLATE, lib ) {
+
+  contains( CONFIG, quick-app ) {
+    message ( Building a quicklaunch application )
+    TEMPLATE = lib
+    CONFIG += plugin
+    DEFINES += OPIE_APP_INTERFACE
+  }
+
+  !contains ( CONFIG, quick-app ) {
+    message( Building a standalone application )
+    TEMPLATE = app
+    DEFINES -= OPIE_APP_INTERFACE
+  }
+}
+}
+

diff --git a/opie-textedit/opie-textedit_cvs.oe b/opie-textedit/opie-textedit_cvs.oe
index 326fea2..0964846 100644 (file)
--- a/opie-textedit/opie-textedit_cvs.oe
+++ b/opie-textedit/opie-textedit_cvs.oe
@@ -1,5 +1,5 @@
 DESCRIPTION = "Opie Text Editor"
-SECTION = "opie/applications"
+SECTION = "opie/pim"
 PRIORITY = "optional"
 MAINTAINER = "Opie Team <opie@handhelds.org>"
 LICENSE = "GPL"
@@ -12,17 +12,9 @@ SRC_URI = "cvs://anoncvs:anoncvs@192.58.209.91/cvs;module=opie/core/apps/textedi
 S = "${WORKDIR}/textedit"
 
 inherit opie
+APPNAME = "textedit"
 
 do_install() {
-    install -d ${D}/${palmtopdir}/bin/
-    install -d ${D}/${palmtopdir}/pics/textedit/
-    install -d ${D}/${palmtopdir}/apps/1Pim/
-    if [ -f ${S}/libtextedit.so.1.0.0 ]; then
-     install -m 0755 libtextedit.so* ${D}/${palmtopdir}/plugins/application/
-     ln -sf ${D}/${palmtopdir}/bin/quicklaunch ${D}/${palmtopdir}/bin/textedit
-    else
-     install -m 0755 ${S}/textedit ${D}/${palmtopdir}/bin/textedit
-    fi
+    install -d ${D}/${palmtopdir}/pics/${APPNAME}
     install -m 0644 ${WORKDIR}/pics/textedit/*.png ${D}/${palmtopdir}/pics/textedit/
-    install -m 0644 ${WORKDIR}/apps/1Pim/textedit.desktop ${D}/${palmtopdir}/apps/1Pim/
 }