[glib] Fix gtk-doc cross-linking among glib/gobject/gio

[Matthias Clasen <matthiasc src gnome org>]

commit 653c2f701a3e0a07a808f4e4fca7b846c50c93fa
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Jul 10 23:55:52 2011 -0400

    Fix gtk-doc cross-linking among glib/gobject/gio
    
    Patch by Daniel Macks, bug 644687.

 docs/reference/gio/Makefile.am  |    3 +++
 docs/reference/glib/Makefile.am |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
index 1913cf2..9eb0fce 100644
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
@@ -67,6 +67,9 @@ extra_files =			\
 	version.xml.in		\
 	gvfs-overview.odg
 
+# Extra options to supply to gtkdoc-fixref
+FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../glib/html --extra-dir=$(srcdir)/../gobject/html
+
 include $(top_srcdir)/gtk-doc.make
 
 EXTRA_DIST +=			\
diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
index 58742d6..472126b 100644
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -44,7 +44,7 @@ content_files =				\
 	gvariant-text.xml
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=
+FIXXREF_OPTIONS=--extra-dir=$(srcdir)/../gobject/html --extra-dir=$(srcdir)/../gio/html
 
 # include common portion ...
 include $(top_srcdir)/gtk-doc.make