autotools: deprecate autotools_stage class

Move the functionality into autotools and ensure all our Poky recipes are no
longer using it.
Keep the autools_stage class around for OE compatability but just have it
inherit autools.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

53 files changed, 53 insertions, 53 deletions

diff --git a/meta-moblin/packages/anerley/anerley.inc b/meta-moblin/packages/anerley/anerley.inc
index 94a5692d87..c18c9b2553 100644
--- a/meta-moblin/packages/anerley/anerley.inc
+++ b/meta-moblin/packages/anerley/anerley.inc
@@ -3,4 +3,4 @@ SRC_URI = "http://download.moblin.org/sources/anerley/0.1/anerley-${PV}.tar.bz2"
 LICENSE = "LGPLv2.1"
 DEPENDS = "telepathy-glib glib-2.0 telepathy-mission-control nbtk eds-dbus"
 
-inherit autotools_stage
+inherit autotools
diff --git a/meta-moblin/packages/aspell/aspell_0.60.6.bb b/meta-moblin/packages/aspell/aspell_0.60.6.bb
index 8fc3fc9385..8d43a707d2 100644
--- a/meta-moblin/packages/aspell/aspell_0.60.6.bb
+++ b/meta-moblin/packages/aspell/aspell_0.60.6.bb
@@ -12,4 +12,4 @@ FILES_${PN} = "${bindir}/aspell"
 FILES_libpspell = "${libdir}/libpspell.so.*"
 FILES_libpspell-dev = "${libdir}/libpspell* ${bindir}/pspell-config ${includedir}/pspell"
 
-inherit autotools_stage gettext
+inherit autotools gettext
diff --git a/meta-moblin/packages/bickley/bickley.inc b/meta-moblin/packages/bickley/bickley.inc
index ada7e8a162..f386b862e3 100644
--- a/meta-moblin/packages/bickley/bickley.inc
+++ b/meta-moblin/packages/bickley/bickley.inc
@@ -6,4 +6,4 @@ RDEPENDS = "xdg-user-dirs"
 
 FILES_${PN} =+ "${datadir}/dbus-1/services/"
 
-inherit autotools_stage
+inherit autotools
diff --git a/meta-moblin/packages/bisho/bisho.inc b/meta-moblin/packages/bisho/bisho.inc
index c2f6617f4d..5ff9b9e35a 100644
--- a/meta-moblin/packages/bisho/bisho.inc
+++ b/meta-moblin/packages/bisho/bisho.inc
@@ -4,6 +4,6 @@ LICENSE = "GPLv2"
 
 DEPENDS = "gtk+ mojito nbtk"
 
-inherit autotools_stage
+inherit autotools
 
 FILES_${PN} += "${datadir}/icons/"
diff --git a/meta-moblin/packages/bognor-regis/bognor-regis.inc b/meta-moblin/packages/bognor-regis/bognor-regis.inc
index 3ca3a99468..34563548f2 100644
--- a/meta-moblin/packages/bognor-regis/bognor-regis.inc
+++ b/meta-moblin/packages/bognor-regis/bognor-regis.inc
@@ -6,4 +6,4 @@ DEPENDS = "glib-2.0 dbus-glib gtk+ libnotify gupnp gupnp-av bickley"
 
 FILES_${PN} += "${datadir}/dbus-1/services"
 
-inherit autotools_stage
+inherit autotools
diff --git a/meta-moblin/packages/carrick/carrick.inc b/meta-moblin/packages/carrick/carrick.inc
index f40aa26c41..1924e9cbfe 100644
--- a/meta-moblin/packages/carrick/carrick.inc
+++ b/meta-moblin/packages/carrick/carrick.inc
@@ -7,7 +7,7 @@ RDEPENDS = "connman"
 
 FILES_${PN} += "${datadir}/icons/hicolor"
 
-inherit autotools_stage
+inherit autotools
 
 do_configure_prepend () {
         mkdir -p ${S}/build/autotools
diff --git a/meta-moblin/packages/check/check_0.9.5.bb b/meta-moblin/packages/check/check_0.9.5.bb
index 05c454aaeb..0a4d47755c 100644
--- a/meta-moblin/packages/check/check_0.9.5.bb
+++ b/meta-moblin/packages/check/check_0.9.5.bb
@@ -8,6 +8,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/check/check-${PV}.tar.gz \
            file://configure_fix.patch;patch=1"
 S = "${WORKDIR}/check-${PV}"
 
-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
 
 EXTRA_OECONF += "--enable-plain-docdir"
diff --git a/meta-moblin/packages/clutter-imcontext/clutter-imcontext_git.bb b/meta-moblin/packages/clutter-imcontext/clutter-imcontext_git.bb
index 43521e6d82..ead537d664 100644
--- a/meta-moblin/packages/clutter-imcontext/clutter-imcontext_git.bb
+++ b/meta-moblin/packages/clutter-imcontext/clutter-imcontext_git.bb
@@ -5,7 +5,7 @@ PR = "r7"
 DEPENDS = "clutter-1.0 glib-2.0"
 S = "${WORKDIR}/git"
 
-inherit autotools_stage
+inherit autotools
 
 do_configure_prepend () {
     echo "EXTRA_DIST=" > ${S}/gtk-doc.make
diff --git a/meta-moblin/packages/dalston/dalston.inc b/meta-moblin/packages/dalston/dalston.inc
index bd137d7731..204bccd697 100644
--- a/meta-moblin/packages/dalston/dalston.inc
+++ b/meta-moblin/packages/dalston/dalston.inc
@@ -4,4 +4,4 @@ LICENSE = "LGPLv2.1"
 
 DEPENDS = "glib-2.0 gtk+ pulseaudio libcanberra libnotify nbtk mutter-moblin"
 
-inherit autotools_stage
+inherit autotools
diff --git a/meta-moblin/packages/enchant/enchant_1.3.0.bb b/meta-moblin/packages/enchant/enchant_1.3.0.bb
index e9e8a898cd..ff113dba69 100644
--- a/meta-moblin/packages/enchant/enchant_1.3.0.bb
+++ b/meta-moblin/packages/enchant/enchant_1.3.0.bb
@@ -4,7 +4,7 @@ LICENSE     = "LGPL"
 DEPENDS     = "aspell"
 RDEPENDS    = "aspell"
 
-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
 
 PR = "r1"
 
diff --git a/meta-moblin/packages/gamin/gamin_0.1.10.bb b/meta-moblin/packages/gamin/gamin_0.1.10.bb
index 144bf7a7d6..48fc73e6d1 100644
--- a/meta-moblin/packages/gamin/gamin_0.1.10.bb
+++ b/meta-moblin/packages/gamin/gamin_0.1.10.bb
@@ -6,4 +6,4 @@ SRC_URI = "http://www.gnome.org/~veillard/gamin/sources/gamin-${PV}.tar.gz \
 
 EXTRA_OECONF = " --without-python " 
 
-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
diff --git a/meta-moblin/packages/gmime/gmime_2.4.10.bb b/meta-moblin/packages/gmime/gmime_2.4.10.bb
index dcec37e20e..3b9327a931 100644
--- a/meta-moblin/packages/gmime/gmime_2.4.10.bb
+++ b/meta-moblin/packages/gmime/gmime_2.4.10.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 zlib"
 
-inherit gnome autotools_stage lib_package binconfig
+inherit gnome autotools lib_package binconfig
 
 SRC_URI += "file://iconv-detect.h \
             file://nodolt.patch;patch=1"
diff --git a/meta-moblin/packages/gnet/gnet_svn.bb b/meta-moblin/packages/gnet/gnet_svn.bb
index ea2c92ff1a..fde58f0f32 100644
--- a/meta-moblin/packages/gnet/gnet_svn.bb
+++ b/meta-moblin/packages/gnet/gnet_svn.bb
@@ -17,4 +17,4 @@ EXTRA_OECONF =	"--disable-pthreads"
 
 FILES_${PN}-dev += "${libdir}/gnet-2.0"
 
-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
diff --git a/meta-moblin/packages/hornsey/hornsey.inc b/meta-moblin/packages/hornsey/hornsey.inc
index 2e2f661c52..c9d9631a78 100644
--- a/meta-moblin/packages/hornsey/hornsey.inc
+++ b/meta-moblin/packages/hornsey/hornsey.inc
@@ -10,4 +10,4 @@ EXTRA_OECONF = "--disable-shave"
 
 FILES_${PN} += "${datadir}/icons"
 
-inherit autotools_stage
+inherit autotools
diff --git a/meta-moblin/packages/json-glib/json-glib_0.6.2.bb b/meta-moblin/packages/json-glib/json-glib_0.6.2.bb
index 822ddad7e5..d96f8b3e19 100644
--- a/meta-moblin/packages/json-glib/json-glib_0.6.2.bb
+++ b/meta-moblin/packages/json-glib/json-glib_0.6.2.bb
@@ -4,4 +4,4 @@ PR = "r0"
 
 DEPENDS = "glib-2.0"
 
-inherit autotools_stage
+inherit autotools
diff --git a/meta-moblin/packages/json-glib/json-glib_git.bb b/meta-moblin/packages/json-glib/json-glib_git.bb
index 7b2e882e15..0b32e3ae34 100644
--- a/meta-moblin/packages/json-glib/json-glib_git.bb
+++ b/meta-moblin/packages/json-glib/json-glib_git.bb
@@ -7,7 +7,7 @@ S = "${WORKDIR}/git"
 
 DEPENDS = "glib-2.0"
 
-inherit autotools_stage
+inherit autotools
 
 EXTRA_OECONF = "--disable-introspection"
 
diff --git a/meta-moblin/packages/libccss/libccss_git.bb b/meta-moblin/packages/libccss/libccss_git.bb
index 020b590716..8bd93c940f 100644
--- a/meta-moblin/packages/libccss/libccss_git.bb
+++ b/meta-moblin/packages/libccss/libccss_git.bb
@@ -4,7 +4,7 @@ PR = "r2"
 DEPENDS = "glib-2.0 cairo librsvg libsoup-2.4"
 S = "${WORKDIR}/git"
 
-inherit autotools_stage
+inherit autotools
 
 do_configure_prepend () {
         echo "EXTRA_DIST=" > ${S}/gtk-doc.make
diff --git a/meta-moblin/packages/libjana/libjana_git.bb b/meta-moblin/packages/libjana/libjana_git.bb
index 976e9adab3..7797580ca5 100644
--- a/meta-moblin/packages/libjana/libjana_git.bb
+++ b/meta-moblin/packages/libjana/libjana_git.bb
@@ -3,7 +3,7 @@ DEPENDS = "gtk+ eds-dbus gconf"
 PV = "0.4.4+git${SRCPV}"
 PR = "r0"
 
-inherit autotools_stage pkgconfig lib_package
+inherit autotools pkgconfig lib_package
 
 SRC_URI = "git://git.gnome.org/jana;protocol=git"
 S = "${WORKDIR}/git/"
diff --git a/meta-moblin/packages/librest/librest_git.bb b/meta-moblin/packages/librest/librest_git.bb
index 3944e1cb48..33e714d6cf 100644
--- a/meta-moblin/packages/librest/librest_git.bb
+++ b/meta-moblin/packages/librest/librest_git.bb
@@ -7,7 +7,7 @@ DEPENDS = "libsoup-2.4"
 
 S = "${WORKDIR}/git"
 
-inherit autotools_stage
+inherit autotools
 
 do_configure_prepend () {
         echo "EXTRA_DIST=" > ${S}/gtk-doc.make
diff --git a/meta-moblin/packages/libsamplerate/libsamplerate0_0.1.2.bb b/meta-moblin/packages/libsamplerate/libsamplerate0_0.1.2.bb
index b04f069cdd..10923404d0 100644
--- a/meta-moblin/packages/libsamplerate/libsamplerate0_0.1.2.bb
+++ b/meta-moblin/packages/libsamplerate/libsamplerate0_0.1.2.bb
@@ -7,4 +7,4 @@ PR = "r3"
 SRC_URI = "http://www.mega-nerd.com/SRC/libsamplerate-${PV}.tar.gz"
 S = "${WORKDIR}/libsamplerate-${PV}"
 
-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
diff --git a/meta-moblin/packages/libsexy/libsexy.inc b/meta-moblin/packages/libsexy/libsexy.inc
index 473faf5e6e..ff68c6d5e6 100644
--- a/meta-moblin/packages/libsexy/libsexy.inc
+++ b/meta-moblin/packages/libsexy/libsexy.inc
@@ -8,6 +8,6 @@ DEPENDS = "gtk+ enchant libxml2"
 SRC_URI = "http://releases.chipx86.com/libsexy/${PN}/${PN}-${PV}.tar.gz \
            file://libsexy-pkgconfig-fixes.patch;patch=1"
 
-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
 
 
diff --git a/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb b/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb
index b49d7a45e7..e46e3e15c0 100644
--- a/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb
+++ b/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz \
 
 S = "${WORKDIR}/libsndfile-${PV}"
 
-inherit autotools_stage lib_package pkgconfig
+inherit autotools lib_package pkgconfig
 
 do_configure_prepend_arm() {
         export ac_cv_sys_largefile_source=1
diff --git a/meta-moblin/packages/libsocialweb/libsocialweb.inc b/meta-moblin/packages/libsocialweb/libsocialweb.inc
index ff72debcad..9238125a74 100644
--- a/meta-moblin/packages/libsocialweb/libsocialweb.inc
+++ b/meta-moblin/packages/libsocialweb/libsocialweb.inc
@@ -3,7 +3,7 @@ SRC_URI = "http://download.moblin.org/sources/${PN}/0.0/${PN}-0.0.tar.bz2"
 DEPENDS = "libsoup-2.4 gconf-dbus librest glib-2.0 twitter-glib gnome-keyring"
 RDEPENDS_${PN} = "connman"
 
-inherit autotools_stage
+inherit autotools
 
 FILES_${PN} += "${datadir}/dbus-1/services"
 FILES_${PN}-dbg += "${libdir}/libsocialweb/sources/.debug/* ${libdir}/libsocialweb/services/.debug/"
diff --git a/meta-moblin/packages/libsynthesis/libsynthesis_git.bb b/meta-moblin/packages/libsynthesis/libsynthesis_git.bb
index a7ea88f5e9..dfe3bdaa6b 100644
--- a/meta-moblin/packages/libsynthesis/libsynthesis_git.bb
+++ b/meta-moblin/packages/libsynthesis/libsynthesis_git.bb
@@ -8,7 +8,7 @@ DEPENDS = "libpcre sqlite3 zlib"
 
 S = "${WORKDIR}/git"
 
-inherit autotools_stage
+inherit autotools
 
 do_configure_prepend () {
         cd ${S}/src
diff --git a/meta-moblin/packages/libunique/libunique_1.0.6.bb b/meta-moblin/packages/libunique/libunique_1.0.6.bb
index bd796fb468..55c3417f72 100644
--- a/meta-moblin/packages/libunique/libunique_1.0.6.bb
+++ b/meta-moblin/packages/libunique/libunique_1.0.6.bb
@@ -5,4 +5,4 @@ DEPENDS = "glib-2.0 gtk+ dbus"
 
 S = "${WORKDIR}/unique-${PV}"
 
-inherit autotools_stage
+inherit autotools
diff --git a/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb b/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb
index 47073879f4..1f388a3b44 100644
--- a/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb
+++ b/meta-moblin/packages/moblin-app-installer/moblin-app-installer_git.bb
@@ -9,4 +9,4 @@ PR = "r0"
 S = "${WORKDIR}/git"
 DEPENDS = "clutter-1.0 glib-2.0 nbtk libxml2 gtk+ gnome-packagekit opkg"
 
-inherit autotools_stage
+inherit autotools
diff --git a/meta-moblin/packages/moblin-gtk-engine/moblin-gtk-engine_git.bb b/meta-moblin/packages/moblin-gtk-engine/moblin-gtk-engine_git.bb
index 3d1a3de29b..e68a8541a7 100644
--- a/meta-moblin/packages/moblin-gtk-engine/moblin-gtk-engine_git.bb
+++ b/meta-moblin/packages/moblin-gtk-engine/moblin-gtk-engine_git.bb
@@ -8,7 +8,7 @@ DEPENDS = "gtk+"
 
 S = "${WORKDIR}/git"
 
-inherit autotools_stage
+inherit autotools
 
 FILES_${PN} = "${libdir}/gtk-2.0/*/engines/*.so ${datadir}/icons ${datadir}/themes"
 FILES_${PN}-dev = "${libdir}/gtk-2.0/*/engines/*"
diff --git a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.7.bb b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.7.bb
index 7bc12e5b28..4544603e75 100644
--- a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.7.bb
+++ b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_0.7.bb
@@ -6,7 +6,7 @@ DEPENDS = "icon-naming-utils-native"
 
 FILES_${PN} += "${datadir}/icons/"
 
-inherit autotools_stage
+inherit autotools
 
 do_install_append () {
         ln -s ../apps/gnome-aisleriot.png ${D}${datadir}/icons/moblin/48x48/categories/applications-games.png
diff --git a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_git.bb b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_git.bb
index a778ae16f4..b73e8d32d8 100644
--- a/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_git.bb
+++ b/meta-moblin/packages/moblin-icon-theme/moblin-icon-theme_git.bb
@@ -9,4 +9,4 @@ BROKEN = "1"
 
 S = "${WORKDIR}/git"
 
-inherit autotools_stage
+inherit autotools
diff --git a/meta-moblin/packages/moblin-menus/moblin-menus_git.bb b/meta-moblin/packages/moblin-menus/moblin-menus_git.bb
index e6d7fde1c0..2d6cb27d04 100644
--- a/meta-moblin/packages/moblin-menus/moblin-menus_git.bb
+++ b/meta-moblin/packages/moblin-menus/moblin-menus_git.bb
@@ -10,4 +10,4 @@ S = "${WORKDIR}/git"
 
 FILES_${PN} += "${datadir}/desktop-directories/*"
 
-inherit autotools_stage
+inherit autotools
diff --git a/meta-moblin/packages/moblin-sound-theme/moblin-sound-theme_0.1.bb b/meta-moblin/packages/moblin-sound-theme/moblin-sound-theme_0.1.bb
index ef1e10839a..7d122dd4c1 100644
--- a/meta-moblin/packages/moblin-sound-theme/moblin-sound-theme_0.1.bb
+++ b/meta-moblin/packages/moblin-sound-theme/moblin-sound-theme_0.1.bb
@@ -2,6 +2,6 @@
 SRC_URI = "file://${PN}-${PV}.tar.bz2"
 PR = "r0"
 
-inherit autotools_stage
+inherit autotools
 
 #FILES_${PN} =+ "${datadir}/icons/moblin"
diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
index befc28a2a0..53c8a3531b 100644
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
+++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
@@ -21,4 +21,4 @@ FILES_${PN}-dbg += "${datadir}/moblin-web-browser/components/.debug/* ${libdir}/
 
 
 
-inherit autotools_stage
+inherit autotools
diff --git a/meta-moblin/packages/mojito/mojito.inc b/meta-moblin/packages/mojito/mojito.inc
index 7eee2edfb2..f823e7437d 100644
--- a/meta-moblin/packages/mojito/mojito.inc
+++ b/meta-moblin/packages/mojito/mojito.inc
@@ -3,7 +3,7 @@ SRC_URI = "http://download.moblin.org/sources/mojito/0.21/mojito-0.21.7.tar.bz2"
 DEPENDS = "libsoup-2.4 gconf-dbus librest glib-2.0 twitter-glib gnome-keyring"
 RDEPENDS_${PN} = "connman"
 
-inherit autotools_stage
+inherit autotools
 
 FILES_${PN} += "${datadir}/dbus-1/services"
 FILES_${PN}-dbg += "${libdir}/mojito/sources/.debug/* ${libdir}/mojito/services/.debug/"
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc
index c5bff816bd..3bf7108555 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-applications.inc
@@ -7,5 +7,5 @@ SRC_URI = "http://download.moblin.org/sources/moblin-panel-applications/0.1/mobl
 
 FILES_${PN} += "${datadir}/dbus-1/services"
 
-inherit autotools_stage
+inherit autotools
 
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc
index 13b2854a2a..4170197fe5 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-media.inc
@@ -6,5 +6,5 @@ SRC_URI = "http://download.moblin.org/sources/moblin-panel-media/0.0/moblin-pane
 
 FILES_${PN} += "${datadir}/dbus-1/services"
 
-inherit autotools_stage
+inherit autotools
 
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc
index 09f28ee7ae..e8ca32f726 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-myzone.inc
@@ -6,5 +6,5 @@ SRC_URI = "http://download.moblin.org/sources/moblin-panel-myzone/0.0/moblin-pan
 
 FILES_${PN} += "${datadir}/dbus-1/services"
 
-inherit autotools_stage
+inherit autotools
 
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc
index 4eb8d99e6a..df01edc09c 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-pasteboard.inc
@@ -6,5 +6,5 @@ SRC_URI = "http://download.moblin.org/sources/moblin-panel-pasteboard/0.0/moblin
 
 FILES_${PN} += "${datadir}/dbus-1/services"
 
-inherit autotools_stage
+inherit autotools
 
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc
index 2deb94ea54..ca6880dfaf 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-people.inc
@@ -7,5 +7,5 @@ SRC_URI = "http://download.moblin.org/sources/moblin-panel-people/0.0/moblin-pan
 
 FILES_${PN} += "${datadir}/dbus-1/services"
 
-inherit autotools_stage
+inherit autotools
 
diff --git a/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc b/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc
index 619fe4fc1c..c5f45a730c 100644
--- a/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc
+++ b/meta-moblin/packages/mutter-moblin/moblin-panel-status.inc
@@ -7,5 +7,5 @@ SRC_URI = "http://download.moblin.org/sources/moblin-panel-status/0.0/moblin-pan
 
 FILES_${PN} += "${datadir}/dbus-1/services"
 
-inherit autotools_stage
+inherit autotools
 
diff --git a/meta-moblin/packages/mutter-moblin/mutter-moblin.inc b/meta-moblin/packages/mutter-moblin/mutter-moblin.inc
index a956e4bfc7..31a3d96733 100644
--- a/meta-moblin/packages/mutter-moblin/mutter-moblin.inc
+++ b/meta-moblin/packages/mutter-moblin/mutter-moblin.inc
@@ -23,7 +23,7 @@ ASNEEDED = ""
 
 EXTRA_OECONF = "--enable-ahoghill --enable-netpanel --enable-people"
 
-inherit autotools_stage
+inherit autotools
 
 do_configure_prepend () {
         rm -f ${S}/build/autotools/gtk-doc.m4
diff --git a/meta-moblin/packages/mx/mx_git.bb b/meta-moblin/packages/mx/mx_git.bb
index 83953a86b4..884b22313a 100644
--- a/meta-moblin/packages/mx/mx_git.bb
+++ b/meta-moblin/packages/mx/mx_git.bb
@@ -6,7 +6,7 @@ PR = "r1"
 DEPENDS = "clutter-1.0 clutter-imcontext"
 S = "${WORKDIR}/git"
 
-inherit autotools_stage
+inherit autotools
 
 EXTRA_OECONF = "--disable-introspection --without-clutter-gesture"
 
diff --git a/meta-moblin/packages/nbtk/nbtk.inc b/meta-moblin/packages/nbtk/nbtk.inc
index 76bfa68e94..0ad2dff6c0 100644
--- a/meta-moblin/packages/nbtk/nbtk.inc
+++ b/meta-moblin/packages/nbtk/nbtk.inc
@@ -7,7 +7,7 @@ DEPENDS = "clutter-1.0 libccss clutter-imcontext"
 
 EXTRA_OECONF = "--disable-introspection"
 
-inherit autotools_stage
+inherit autotools
 
 do_configure_prepend () {
         echo "EXTRA_DIST=" > ${S}/gtk-doc.make
diff --git a/meta-moblin/packages/packagekit/packagekit_0.5.6.bb b/meta-moblin/packages/packagekit/packagekit_0.5.6.bb
index 6cd1101122..57f05650c1 100644
--- a/meta-moblin/packages/packagekit/packagekit_0.5.6.bb
+++ b/meta-moblin/packages/packagekit/packagekit_0.5.6.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ python polkit dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1) connman"
 RDEPENDS_${PN} = "opkg"
 
-inherit gnome autotools_stage
+inherit gnome autotools
 
 SRC_URI = "http://www.packagekit.org/releases/PackageKit-${PV}.tar.gz \
            file://configurefix.patch;patch=1 \
diff --git a/meta-moblin/packages/procps/procps.inc b/meta-moblin/packages/procps/procps.inc
index cfe9971a08..2de32d2c83 100644
--- a/meta-moblin/packages/procps/procps.inc
+++ b/meta-moblin/packages/procps/procps.inc
@@ -13,4 +13,4 @@ FILES_${PN} += "${base_libdir}/libproc-*.so"
 SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
            file://install.patch;patch=1"
 
-inherit autotools_stage
+inherit autotools
diff --git a/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb b/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb
index c2058fb715..207f1b1ec6 100644
--- a/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb
+++ b/meta-moblin/packages/pulseaudio/libatomics-ops_1.2.bb
@@ -11,4 +11,4 @@ S = "${WORKDIR}/libatomic_ops-${PV}"
 
 ALLOW_EMPTY_${PN} = "1"
 
-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
diff --git a/meta-moblin/packages/syncevolution/syncevolution_git.bb b/meta-moblin/packages/syncevolution/syncevolution_git.bb
index 435683c13e..9d767ca949 100644
--- a/meta-moblin/packages/syncevolution/syncevolution_git.bb
+++ b/meta-moblin/packages/syncevolution/syncevolution_git.bb
@@ -10,7 +10,7 @@ EXTRA_OECONF = "--enable-gui=moblin"
 
 S = "${WORKDIR}/git"
 
-inherit autotools_stage
+inherit autotools
 
 do_configure_prepend () {
     ${S}/gen-autotools.sh
diff --git a/meta-moblin/packages/taglib/taglib_1.6.1.bb b/meta-moblin/packages/taglib/taglib_1.6.1.bb
index e6d634ce3a..f1a87368a7 100644
--- a/meta-moblin/packages/taglib/taglib_1.6.1.bb
+++ b/meta-moblin/packages/taglib/taglib_1.6.1.bb
@@ -10,7 +10,7 @@ SRC_URI = "http://developer.kde.org/~wheeler/files/src/taglib-${PV}.tar.gz \
 
 S = "${WORKDIR}/taglib-${PV}"
 
-inherit autotools_stage pkgconfig binconfig
+inherit autotools pkgconfig binconfig
 
 PACKAGES =+ "${PN}-c"
 FILES_${PN}-dbg += "${bindir}/taglib-config"
diff --git a/meta-moblin/packages/tracker/tracker_0.7.18.bb b/meta-moblin/packages/tracker/tracker_0.7.18.bb
index db2d41117f..2b908641e4 100644
--- a/meta-moblin/packages/tracker/tracker_0.7.18.bb
+++ b/meta-moblin/packages/tracker/tracker_0.7.18.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2"
 DEPENDS = "file gtk+ gstreamer gamin dbus poppler libexif libgsf libgnomecanvas"
 HOMEPAGE = "http://www.tracker-project.org/"
 
-inherit autotools_stage pkgconfig gnome gettext
+inherit autotools pkgconfig gnome gettext
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/0.7/tracker-${PV}.tar.bz2 \
            file://munge-configure.ac-cross-compile.patch;patch=1 \
diff --git a/meta-moblin/packages/twitter-glib/twitter-glib_git.bb b/meta-moblin/packages/twitter-glib/twitter-glib_git.bb
index 8a18517d79..7d4d990fec 100644
--- a/meta-moblin/packages/twitter-glib/twitter-glib_git.bb
+++ b/meta-moblin/packages/twitter-glib/twitter-glib_git.bb
@@ -10,7 +10,7 @@ S = "${WORKDIR}/git"
 
 EXTRA_OECONF = "--disable-shave --disable-introspection --disable-maintainer-flags"
 
-inherit autotools_stage
+inherit autotools
 
 do_configure_prepend () {
          echo "EXTRA_DIST=" > ${S}/gtk-doc.make
diff --git a/meta-moblin/packages/xdg-user-dirs/xdg-user-dirs_0.10.bb b/meta-moblin/packages/xdg-user-dirs/xdg-user-dirs_0.10.bb
index a0fa9c666f..579672cf51 100644
--- a/meta-moblin/packages/xdg-user-dirs/xdg-user-dirs_0.10.bb
+++ b/meta-moblin/packages/xdg-user-dirs/xdg-user-dirs_0.10.bb
@@ -4,7 +4,7 @@ SRC_URI = "http://user-dirs.freedesktop.org/releases/xdg-user-dirs-0.10.tar.gz \
 DEPENDS = "gettext"
 PR = "r1"
 
-inherit autotools_stage
+inherit autotools
 
 do_install_append () {
         install -d ${D}${sysconfdir}/skel/.config/
diff --git a/meta-moblin/packages/xorg-app/xorg-app-common.inc b/meta-moblin/packages/xorg-app/xorg-app-common.inc
index 2dc659a0fa..11f7fe3e00 100644
--- a/meta-moblin/packages/xorg-app/xorg-app-common.inc
+++ b/meta-moblin/packages/xorg-app/xorg-app-common.inc
@@ -10,6 +10,6 @@ SRC_URI = "${XORG_MIRROR}/individual/app/${XORG_PN}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
 
 FILES_${PN} += "  /usr/lib/X11/${XORG_PN}"
diff --git a/meta-moblin/packages/xorg-data/xorg-data-common.inc b/meta-moblin/packages/xorg-data/xorg-data-common.inc
index 3e652c3e1d..e128763398 100644
--- a/meta-moblin/packages/xorg-data/xorg-data-common.inc
+++ b/meta-moblin/packages/xorg-data/xorg-data-common.inc
@@ -7,4 +7,4 @@ XORG_PN = "${PN}"
 SRC_URI = "${XORG_MIRROR}/individual/data/${XORG_PN}-${PV}.tar.bz2"
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
diff --git a/meta-moblin/packages/xorg-driver/xf86-driver-common.inc b/meta-moblin/packages/xorg-driver/xf86-driver-common.inc
index 3cb8cd021e..af68335f6c 100644
--- a/meta-moblin/packages/xorg-driver/xf86-driver-common.inc
+++ b/meta-moblin/packages/xorg-driver/xf86-driver-common.inc
@@ -16,7 +16,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
 FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so"
 FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"
 
-inherit autotools_stage pkgconfig
+inherit autotools pkgconfig
 
 # AC_CHECK_FILE doesn't work when cross compiling, so we create a replacement
 # macro that simply assumes the test succeeds.