Opietooth:

    do not install the headers with generic names like parser.h
    in $STAGING_INCDIR but in a dedicated subdir
packages/libopietooth/libopietooth:
    -create a common file (libopietooth1.inc)
    -install the headers in a subdirectory
    -adjust the 1.2.0 and cvs version to include the new file
packages/opie-bluetoothmanager/opie-bluetoothmanager:
    -adjust to the new place for the header files
packages/opie-bluetoothapplet/opie-bluetoothapplet:
    -adjust to the new place for the header files

diff --git a/packages/libopietooth/libopietooth1_1.2.0.bb b/packages/libopietooth/libopietooth1_1.2.0.bb
index 79cb638..0dc91b2 100644 (file)
--- a/packages/libopietooth/libopietooth1_1.2.0.bb
+++ b/packages/libopietooth/libopietooth1_1.2.0.bb
@@ -1,24 +1,5 @@
-DESCRIPTION = "Opie Bluetooth library"
-SECTION = "opie/libs"
-PRIORITY = "optional"
-DEPENDS = "libopie2"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "LGPL"
-
-
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/net/opietooth/lib"
 
-inherit opie
-
-
-S = "${WORKDIR}/lib"
+include libopietooth1.inc
 
-do_stage() {
-        install -m 0644 *.h ${STAGING_INCDIR}/
-       oe_libinstall -so libopietooth1 ${STAGING_LIBDIR}/
-}
- 
-do_install() {
-       oe_libinstall -so libopietooth1 ${D}${palmtopdir}/lib
-}
 

diff --git a/packages/libopietooth/libopietooth1_cvs.bb b/packages/libopietooth/libopietooth1_cvs.bb
index 2d167b9..79244a6 100644 (file)
--- a/packages/libopietooth/libopietooth1_cvs.bb
+++ b/packages/libopietooth/libopietooth1_cvs.bb
@@ -1,23 +1,4 @@
-DESCRIPTION = "Opie Bluetooth library"
-SECTION = "opie/libs"
-PRIORITY = "optional"
-DEPENDS = "libopie2"
-MAINTAINER = "Team Opie <opie@handhelds.org>"
-LICENSE = "LGPL"
-
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/net/opietooth/lib"
 PV = "1.2.0+cvs-${CVSDATE}"
 
-inherit opie
-
-S = "${WORKDIR}/lib"
-
-do_stage() {
-        install -m 0644 *.h ${STAGING_INCDIR}/
-       oe_libinstall -so libopietooth1 ${STAGING_LIBDIR}/
-}
- 
-do_install() {
-       oe_libinstall -so libopietooth1 ${D}${palmtopdir}/lib
-}
-
+include libopietooth1.inc

diff --git a/packages/opie-bluetoothapplet/opie-bluetoothapplet.inc b/packages/opie-bluetoothapplet/opie-bluetoothapplet.inc
index 9fc0723..57930e4 100644 (file)
--- a/packages/opie-bluetoothapplet/opie-bluetoothapplet.inc
+++ b/packages/opie-bluetoothapplet/opie-bluetoothapplet.inc
@@ -8,6 +8,8 @@ APPNAME = "bluetoothapplet"
 
 S = "${WORKDIR}/applet"
 
+EXTRA_QMAKEVARS_POST += " INCLUDEPATH+=${STAGING_INCDIR}/opietooth "
+
 inherit opie
 
 do_install() {

diff --git a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc
index 8e7f003..f5ebf88 100644 (file)
--- a/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc
+++ b/packages/opie-bluetoothmanager/opie-bluetoothmanager.inc
@@ -9,6 +9,8 @@ APPNAME = "bluetooth-manager"
 
 S = "${WORKDIR}/manager"
 
+EXTRA_QMAKEVARS_POST += " INCLUDEPATH+=${STAGING_INCDIR}/opietooth "
+
 inherit opie
 
 # Files: plugins/application/libbluetooth-manager.so* bin/bluetooth-manager apps/Settings/bluetooth-manager.desktop pics/opietooth/*