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

git-svn-id: https://svn.o-hand.com/repos/poky@134 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 openembedded/conf/distro/openzaurus.conf           | 12 ++++++++++++
 openembedded/conf/distro/openzaurus.inc            | 12 ------------
 .../packages/matchbox-panel/matchbox-panel.inc     | 22 ++++++++++++++++++++++
 3 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 openembedded/conf/distro/openzaurus.conf
 delete mode 100644 openembedded/conf/distro/openzaurus.inc
 create mode 100644 openembedded/packages/matchbox-panel/matchbox-panel.inc

(limited to 'openembedded')

diff --git a/openembedded/conf/distro/openzaurus.conf b/openembedded/conf/distro/openzaurus.conf
new file mode 100644
index 000000000..9208aeda0
--- /dev/null
+++ b/openembedded/conf/distro/openzaurus.conf
@@ -0,0 +1,12 @@
+#@TYPE: Distribution
+#@NAME: OpenZaurus
+#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org)
+
+INHERIT += " package_ipk debian"
+# For some reason, this doesn't work
+# TARGET_OS ?= "linux"
+TARGET_OS = "linux"
+TARGET_FPU = "soft"
+
+PARALLEL_INSTALL_MODULES = "1"
+
diff --git a/openembedded/conf/distro/openzaurus.inc b/openembedded/conf/distro/openzaurus.inc
deleted file mode 100644
index 9208aeda0..000000000
--- a/openembedded/conf/distro/openzaurus.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-#@TYPE: Distribution
-#@NAME: OpenZaurus
-#@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org)
-
-INHERIT += " package_ipk debian"
-# For some reason, this doesn't work
-# TARGET_OS ?= "linux"
-TARGET_OS = "linux"
-TARGET_FPU = "soft"
-
-PARALLEL_INSTALL_MODULES = "1"
-
diff --git a/openembedded/packages/matchbox-panel/matchbox-panel.inc b/openembedded/packages/matchbox-panel/matchbox-panel.inc
new file mode 100644
index 000000000..58f42ef7f
--- /dev/null
+++ b/openembedded/packages/matchbox-panel/matchbox-panel.inc
@@ -0,0 +1,22 @@
+DESCRIPTION = "Matchbox Window Manager Panel"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel wireless-tools"
+SECTION = "x11/wm"
+
+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_h2200 = " --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"
+
-- 
cgit v1.2.3