9 files changed, 9 insertions, 46 deletions

diff --git a/meta/packages/clutter/aaina.inc b/meta/packages/clutter/aaina.inc
index 1baccc730c..29a0e0c0d6 100644
--- a/meta/packages/clutter/aaina.inc
+++ b/meta/packages/clutter/aaina.inc
@@ -4,9 +4,4 @@ LICENSE = "GPL"
 
 DEPENDS = "clutter-0.6 libxml2 gtk+ neon"
 
-inherit autotools pkgconfig
-
-do_stage () {
-        autotools_stage_all
-}
-
+inherit autotools_stage pkgconfig
diff --git a/meta/packages/clutter/clutter-box2d.inc b/meta/packages/clutter/clutter-box2d.inc
index c5cd3283e2..7e279a2a04 100644
--- a/meta/packages/clutter/clutter-box2d.inc
+++ b/meta/packages/clutter/clutter-box2d.inc
@@ -7,11 +7,7 @@ DEPENDS = "clutter-0.8"
 # The main clutter lib is machine specific so we need to be too
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-inherit autotools pkgconfig gtk-doc
-
-do_stage () {
-        autotools_stage_all
-}
+inherit autotools_stage pkgconfig gtk-doc
 
 do_install_append () {
         install -d ${D}${bindir}
diff --git a/meta/packages/clutter/clutter-cairo.inc b/meta/packages/clutter/clutter-cairo.inc
index 3a94c35ad6..2e6e3e5ee0 100644
--- a/meta/packages/clutter/clutter-cairo.inc
+++ b/meta/packages/clutter/clutter-cairo.inc
@@ -9,9 +9,5 @@ FILESPATH = "${FILE_DIRNAME}/clutter-cairo"
 PACKAGES =+ "${PN}-examples"
 FILES_${PN}-examples = "${bindir}/flowers ${bindir}/clock"
 
-inherit autotools pkgconfig
-
-do_stage () {
-        autotools_stage_all
-}
+inherit autotools_stage pkgconfig
 
diff --git a/meta/packages/clutter/clutter-gst.inc b/meta/packages/clutter/clutter-gst.inc
index ad921bd0c0..c3a659767c 100644
--- a/meta/packages/clutter/clutter-gst.inc
+++ b/meta/packages/clutter/clutter-gst.inc
@@ -9,9 +9,5 @@ FILESPATH = "${FILE_DIRNAME}/clutter-gst"
 PACKAGES =+ "${PN}-examples"
 FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink ${bindir}/audio"
 
-inherit autotools pkgconfig gtk-doc
-
-do_stage () {
-        autotools_stage_all
-}
+inherit autotools_stage pkgconfig gtk-doc
 
diff --git a/meta/packages/clutter/clutter-gtk.inc b/meta/packages/clutter/clutter-gtk.inc
index 0545571b44..bbecee548c 100644
--- a/meta/packages/clutter/clutter-gtk.inc
+++ b/meta/packages/clutter/clutter-gtk.inc
@@ -9,9 +9,5 @@ FILESPATH = "${FILE_DIRNAME}/clutter-gtk"
 PACKAGES =+ "${PN}-examples"
 FILES_${PN}-examples = "${bindir}/gtk-clutter-test ${bindir}/gtk-clutter-events ${bindir}/gtk-clutter-multistage"
 
-inherit autotools pkgconfig gtk-doc
-
-do_stage () {
-        autotools_stage_all
-}
+inherit autotools_stage pkgconfig gtk-doc
 
diff --git a/meta/packages/clutter/clutter-helix.inc b/meta/packages/clutter/clutter-helix.inc
index 6e0612ad3a..7b17185612 100644
--- a/meta/packages/clutter/clutter-helix.inc
+++ b/meta/packages/clutter/clutter-helix.inc
@@ -9,9 +9,5 @@ FILESPATH = "${FILE_DIRNAME}/clutter-helix"
 PACKAGES =+ "${PN}-examples"
 FILES_${PN}-examples = "${bindir}/video-player ${bindir}/audio-player"
 
-inherit autotools pkgconfig gtk-doc
-
-do_stage () {
-        autotools_stage_all
-}
+inherit autotools_stage pkgconfig gtk-doc
 
diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc
index 1caa1c74e9..7e9f99269e 100644
--- a/meta/packages/clutter/clutter.inc
+++ b/meta/packages/clutter/clutter.inc
@@ -45,7 +45,7 @@ PACKAGE_ARCH_menlow = "${MACHINE_ARCH}"
 
 FILESPATH = "${FILE_DIRNAME}/clutter"
 
-inherit autotools pkgconfig gtk-doc
+inherit autotools_stage pkgconfig gtk-doc
 
 PACKAGES =+ "clutter-examples"
 FILES_clutter-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
@@ -58,7 +58,3 @@ do_configure_prepend() {
         sed -i s:doc/reference/Makefile::g ${S}/configure.ac
         sed -i s:doc::g ${S}/Makefile.am
 }
-
-do_stage () {
-        autotools_stage_all
-}
diff --git a/meta/packages/clutter/table.inc b/meta/packages/clutter/table.inc
index b07b39dc1e..6a5b32ccda 100644
--- a/meta/packages/clutter/table.inc
+++ b/meta/packages/clutter/table.inc
@@ -4,14 +4,10 @@ LICENSE = "LGPL"
 
 DEPENDS = "clutter-gst-0.6 gnome-vfs"
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 do_install() {
         install -d ${D}${bindir}
         install -m 0755 ${S}/table ${D}${bindir}/table
 }
 
-#do_stage () {
-#        autotools_stage_all
-#}
-
diff --git a/meta/packages/clutter/tidy.inc b/meta/packages/clutter/tidy.inc
index d1f11976cd..14ec4ca9a8 100644
--- a/meta/packages/clutter/tidy.inc
+++ b/meta/packages/clutter/tidy.inc
@@ -8,7 +8,7 @@ BASE_CONF = "--disable-gtk-doc"
 DEPENDS = "${STDDEPENDS}"
 EXTRA_OECONF = "${BASE_CONF}"
 
-inherit autotools pkgconfig
+inherit autotools_stage pkgconfig
 
 PACKAGES =+ "tidy-examples"
 FILES_tidy-examples = "${bindir}/test-*"
@@ -18,7 +18,3 @@ do_configure_prepend() {
         sed -i s:docs/reference/Makefile::g ${S}/configure.ac
         sed -i s:docs::g ${S}/Makefile.am
 }
-
-do_stage () {
-        autotools_stage_all
-}