atk: Multiple fixes.

 - add recipe for version 1.18.0
 - make all recipes use atk.inc

diff --git a/packages/atk/atk.inc b/packages/atk/atk.inc
index e47a431..5f81cdf 100644 (file)
--- a/packages/atk/atk.inc
+++ b/packages/atk/atk.inc
@@ -1,13 +1,14 @@
-DEPENDS = "glib-2.0 gtk-doc-native"
 DESCRIPTION = "An accessibility toolkit for GNOME."
 SECTION = "x11/libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 
+DEPENDS = "glib-2.0 gtk-doc-native"
+
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-glibtest"
 
-CFLAGS_append = " -I${STAGING_INCDIR}/glib-2.0 \
-                 -I${STAGING_INCDIR}/glib-2.0/glib \
-                 -I${STAGING_INCDIR}/glib-2.0/gobject"
+do_stage () {
+       autotools_stage_all
+}

diff --git a/packages/atk/atk_1.18.0.bb b/packages/atk/atk_1.18.0.bb
new file mode 100644 (file)
index 0000000..116d8ca
--- /dev/null
+++ b/packages/atk/atk_1.18.0.bb
@@ -0,0 +1,8 @@
+require atk.inc
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/atk/1.18/atk-${PV}.tar.bz2"
+
+do_stage () {
+       oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
+       autotools_stage_includes
+}

diff --git a/packages/atk/atk_1.19.3.bb b/packages/atk/atk_1.19.3.bb
index 5213668..28adc02 100644 (file)
--- a/packages/atk/atk_1.19.3.bb
+++ b/packages/atk/atk_1.19.3.bb
@@ -2,7 +2,13 @@ require atk.inc
 
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/atk/1.19/atk-${PV}.tar.bz2"
 
+CFLAGS_append = "\
+       -I${STAGING_INCDIR}/glib-2.0 \
+       -I${STAGING_INCDIR}/glib-2.0/glib \
+       -I${STAGING_INCDIR}/glib-2.0/gobject \
+       "
+
 do_stage () {
-        oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
-        autotools_stage_includes
+       oe_libinstall -so -C atk libatk-1.0 ${STAGING_LIBDIR}
+       autotools_stage_includes
 }

diff --git a/packages/atk/atk_1.20.0.bb b/packages/atk/atk_1.20.0.bb
index a909e0e..bb64492 100644 (file)
--- a/packages/atk/atk_1.20.0.bb
+++ b/packages/atk/atk_1.20.0.bb
@@ -1,16 +1,6 @@
-DESCRIPTION = "An accessibility toolkit for GNOME."
-SECTION = "x11/libs"
-PRIORITY = "optional"
-LICENSE = "LGPL"
-
-DEPENDS = "glib-2.0 gtk-doc-native"
+require atk.inc
 
 SRC_URI = "http://download.gnome.org/sources/atk/1.20/${PN}-${PV}.tar.bz2"
 
-inherit autotools pkgconfig
 
-EXTRA_OECONF = "--disable-glibtest"
 
-do_stage () {
-       autotools_stage_all
-}