glib: change to use autotools_stage_all in native 2.6.5 and 2.8.2

 - do_stage calls autotools_stage_all, additional files still have
 - to be staged (most significantly glibconfig.h)

diff --git a/packages/glib-2.0/glib-2.0-native_2.6.5.bb b/packages/glib-2.0/glib-2.0-native_2.6.5.bb
index 6615fc3..6524bf2 100644 (file)
--- a/packages/glib-2.0/glib-2.0-native_2.6.5.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.6.5.bb
@@ -8,7 +8,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk-doc-native"
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = "--disable-debug"
 
@@ -26,22 +26,11 @@ do_configure_prepend () {
 }
 
 do_stage () {
+       autotools_stage_all
        install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
        install -m 0755 gobject/.libs/glib-genmarshal ${STAGING_BINDIR}/
        install -m 0755 glib-gettextize ${STAGING_BINDIR}/
-       oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
-       oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
-       oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
-       oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
-       autotools_stage_includes
-       install -d ${STAGING_INCDIR}/glib-2.0/glib
        install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
-       install -d ${STAGING_DATADIR}/aclocal
-       install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
-       install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
-       install -d ${STAGING_DATADIR}/glib-2.0/gettext/po
-       install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/
-       install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/
 }
 
 do_install () {

diff --git a/packages/glib-2.0/glib-2.0_2.8.2.bb b/packages/glib-2.0/glib-2.0_2.8.2.bb
index d377a0a..406f9d8 100644 (file)
--- a/packages/glib-2.0/glib-2.0_2.8.2.bb
+++ b/packages/glib-2.0/glib-2.0_2.8.2.bb
@@ -10,7 +10,7 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
-PR = "r0"
+PR = "r1"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
@@ -35,14 +35,6 @@ do_configure_prepend () {
 }
 
 do_stage () {
-       oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
-       oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
-       oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
-       oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
-       autotools_stage_includes
-       install -d ${STAGING_INCDIR}/glib-2.0/glib
+       autotools_stage_all
        install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
-       install -d ${STAGING_DATADIR}/aclocal
-       install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
-       install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
 }