summaryrefslogtreecommitdiff
path: root/openembedded/packages/matchbox-panel
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2005-10-11 17:20:26 +0000
committerRichard Purdie <richard@openedhand.com>2005-10-11 17:20:26 +0000
commitea7da1dd061b7ef4eabd61c6073e6a27709fe972 (patch)
tree46f9ce0ed02ec3fc4d82b3e660d7a3a81627243a /openembedded/packages/matchbox-panel
parent42974a1e1288e787cb4d5bb66acba691b06209ca (diff)
downloadopenembedded-core-ea7da1dd061b7ef4eabd61c6073e6a27709fe972.tar.gz
openembedded-core-ea7da1dd061b7ef4eabd61c6073e6a27709fe972.tar.bz2
openembedded-core-ea7da1dd061b7ef4eabd61c6073e6a27709fe972.zip
More merging with OE. Fix settings-daemon depends.
git-svn-id: https://svn.o-hand.com/repos/poky@133 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/matchbox-panel')
-rw-r--r--openembedded/packages/matchbox-panel/matchbox-panel_0.9.2.bb22
-rw-r--r--openembedded/packages/matchbox-panel/matchbox-panel_svn.bb15
2 files changed, 5 insertions, 32 deletions
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 5559929141..2477cd8b2d 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 dab3452ef1..f0e80d3d22 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}
+