3 files changed, 21 insertions, 26 deletions

diff --git a/meta/packages/tasks/task-poky-sdk-gmae.bb b/meta/packages/tasks/task-poky-sdk-gmae.bb
index b89eca1798..29ac801a32 100644
--- a/meta/packages/tasks/task-poky-sdk-gmae.bb
+++ b/meta/packages/tasks/task-poky-sdk-gmae.bb
@@ -3,22 +3,14 @@
 #
 
 DESCRIPTON = "Gnome Mobile And Embedded Software Development Kit for OpenedHand Poky"
-DEPENDS = "task-poky-sdk"
+PR = "r1"
 
 ALLOW_EMPTY = "1"
 
-PACKAGES = "\
-    task-poky-sdk-gmae \
-    task-poky-sdk-gmae-dbg"
+require task-sdk-gmae.inc
 
-RDEPENDS_task-poky-sdk-gmae = "\
+PACKAGES = "${PN}"
+
+RDEPENDS = "\
     task-poky-sdk \
-    gtk+-dev \
-    eds-dbus-dev \
-    gstreamer-dev \
-    bluez-libs-dev \
-    gnome-vfs-dev \
-    gconf-dbus-dev \
-    avahi-dev \
-    libtelepathy-dev \
-    "
+    ${SDK-GMAE}"
diff --git a/meta/packages/tasks/task-poky-standalone-gmae-sdk-target.bb b/meta/packages/tasks/task-poky-standalone-gmae-sdk-target.bb
index 6cb3fe8547..775bb92dca 100644
--- a/meta/packages/tasks/task-poky-standalone-gmae-sdk-target.bb
+++ b/meta/packages/tasks/task-poky-standalone-gmae-sdk-target.bb
@@ -3,21 +3,14 @@
 #
 
 DESCRIPTON = "Gnome Mobile And Embedded Software Development Kit for OpenedHand Poky"
-DEPENDS = "task-poky-standalone-sdk-target"
-PR = "r2"
+PR = "r3"
 
 ALLOW_EMPTY = "1"
 
+require task-sdk-gmae.inc
+
 PACKAGES = "${PN}"
 
-RDEPENDS_${PN} = "\
+RDEPENDS = "\
     task-poky-standalone-sdk-target \
-    gtk+-dev \
-    eds-dbus-dev \
-    gstreamer-dev \
-    bluez-libs-dev \
-    gnome-vfs-dev \
-    gconf-dbus-dev \
-    avahi-dev \
-    libtelepathy-dev \
-    "
+    ${SDK-GMAE}"
diff --git a/meta/packages/tasks/task-sdk-gmae.inc b/meta/packages/tasks/task-sdk-gmae.inc
new file mode 100644
index 0000000000..b9481101fc
--- /dev/null
+++ b/meta/packages/tasks/task-sdk-gmae.inc
@@ -0,0 +1,10 @@
+SDK-GMAE = " \
+    gtk+-dev \
+    eds-dbus-dev \
+    gstreamer-dev \
+    bluez-libs-dev \
+    gnome-vfs-dev \
+    gconf-dbus-dev \
+    avahi-dev \
+    libtelepathy-dev \
+    "