From ea7da1dd061b7ef4eabd61c6073e6a27709fe972 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 11 Oct 2005 17:20:26 +0000
Subject: More merging with OE. Fix settings-daemon depends.

git-svn-id: https://svn.o-hand.com/repos/poky@133 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../matchbox-panel/matchbox-panel_0.9.2.bb         | 22 ++--------------------
 .../packages/matchbox-panel/matchbox-panel_svn.bb  | 15 +++------------
 2 files changed, 5 insertions(+), 32 deletions(-)

(limited to 'openembedded/packages/matchbox-panel')

diff --git a/openembedded/packages/matchbox-panel/matchbox-panel_0.9.2.bb b/openembedded/packages/matchbox-panel/matchbox-panel_0.9.2.bb
index 555992914..2477cd8b2 100644
--- a/openembedded/packages/matchbox-panel/matchbox-panel_0.9.2.bb
+++ b/openembedded/packages/matchbox-panel/matchbox-panel_0.9.2.bb
@@ -1,24 +1,6 @@
-DESCRIPTION = "Matchbox Window Manager Panel"
-LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel wireless-tools"
-SECTION = "x11/wm"
-PR="r2"
+include matchbox-panel.inc
 
+PR="r2"
 SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz"
 
-inherit autotools pkgconfig gettext
-
-CFLAGS += "-D_GNU_SOURCE"
-
-EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
-EXTRA_OECONF_append_h3600 = " --enable-small-icons "
-EXTRA_OECONF_append_h3900 = " --enable-small-icons "
-EXTRA_OECONF_append_collie = " --enable-small-icons "
-EXTRA_OECONF_append_poodle = " --enable-small-icons "
-EXTRA_OECONF_append_mnci = " --enable-small-icons "
-EXTRA_OECONF_append_integral = " --enable-small-icons "
-
-FILES_${PN} = "${bindir} \
-	       ${datadir}/applications \
-	       ${datadir}/pixmaps"
 
diff --git a/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb b/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb
index dab3452ef..f0e80d3d2 100644
--- a/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb
+++ b/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb
@@ -1,20 +1,11 @@
-DESCRIPTION = "Matchbox Window Manager Panel"
-LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel"
-SECTION = "x11/wm"
+include matchbox-panel.inc
 PV = "0.9.2+cvs-${CVSDATE}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
 
-S = ${WORKDIR}/${PN}
-
-inherit autotools pkgconfig gettext
-
 EXTRA_OECONF = "--enable-startup-notification --enable-dnotify"
-CFLAGS += " -D_GNU_SOURCE"
 
-FILES_${PN} = "${bindir} \
-	       ${datadir}/applications \
-	       ${datadir}/pixmaps"
+S = ${WORKDIR}/${PN}
+
 
-- 
cgit v1.2.3