4 files changed, 4 insertions, 20 deletions

diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo.inc b/meta-gnome/recipes-gnome/bonobo/libbonobo.inc
index b876db4b3..8b6007e86 100644
--- a/meta-gnome/recipes-gnome/bonobo/libbonobo.inc
+++ b/meta-gnome/recipes-gnome/bonobo/libbonobo.inc
@@ -5,11 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 SECTION = "x11/gnome/libs"
 DEPENDS = "glib-2.0 orbit2 intltool-native libxml2 dbus dbus-glib"
 
-inherit gnomebase
-
-SRC_URI += "file://gtk-doc.m4 \
-            file://gtk-doc.make \
-"
+inherit gnomebase gtk-doc
 
 ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
 
@@ -23,12 +19,6 @@ LEAD_SONAME = "libbonobo-2.so"
 
 PARALLEL_MAKE = ""
 
-do_configure_prepend() {
-    install -d m4
-    install ${WORKDIR}/gtk-doc.m4 m4/
-    install ${WORKDIR}/gtk-doc.make ./
-}
-
 do_compile() {
     oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
 }
diff --git a/meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb b/meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb
index 6cf1e3fe8..5b367de7b 100644
--- a/meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb
+++ b/meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
 
 DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native"
 
-inherit gnomebase pkgconfig autotools-brokensep gettext
+inherit gnomebase pkgconfig autotools-brokensep gettext gtk-doc
 
 SRC_URI[archive.md5sum] = "ec5262cbcb07b63b58d45aa3ac636096"
 SRC_URI[archive.sha256sum] = "fb244138276a5ce98510b0e2408bbf6f9ce0fd8cdcf86f07cd4be38afbb7c2bc"
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb b/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb
index b33fc850f..22b3bf438 100644
--- a/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb
+++ b/meta-gnome/recipes-gnome/libgnome/libgnomecanvas_2.30.3.bb
@@ -3,7 +3,7 @@ LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605"
 SECTION = "x11/gnome/libs"
 
-inherit gnome
+inherit gnome gtk-doc
 
 # intltool to provide IT_PROG_INTLTOOL
 # configure: line 12654: syntax error near unexpected token `0.35.0'
@@ -13,13 +13,7 @@ DEPENDS = "gtk+ libglade libart-lgpl xineramaproto intltool-native"
 SRC_URI[archive.md5sum] = "ffcbb719c671ff5cd86e59aeba8d0b92"
 SRC_URI[archive.sha256sum] = "859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40"
 
-EXTRA_OECONF = "--disable-gtk-doc"
-
 FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
 FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/"
 FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas*.la"
 FILES_${PN}-staticdev += "${libdir}/libglade/*/libcanvas*.a"
-
-do_configure_prepend() {
-    sed -i -e s:docs::g ${S}/Makefile.am
-}
diff --git a/meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb
index d2fedfc18..69a0f5c03 100644
--- a/meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb
+++ b/meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb
@@ -2,7 +2,7 @@ SUMMARY = "LibGTop2"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://copyright.txt;md5=dbc839bf158d19a20e661db14db7a58c"
 
-inherit gnomebase lib_package
+inherit gnomebase lib_package gtk-doc
 SRC_URI[archive.md5sum] = "ed44d736efd97d062b77621de6aff439"
 SRC_URI[archive.sha256sum] = "49958d7da1f76b257bfd0d557d8ed2b218a5ab0d31b59fed1c32ddf2a1529f5d"