reviewed by: Matthias Clasen <mclasen@redhat.com>

* gdk-pixbuf/Makefile.am:
* gdk/Makefile.am:
* gtk/Makefile.am: use installation prefixes of dependent libs to
crossreference docs (#407146).

svn path=/trunk/; revision=17295

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index d675392968d486d2b170705fdcd75cd9880a2bfa..371225506034e399b61d1b21e9970796c36d440e 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-14  Stefan Kost  <ensonic@users.sf.net>
+
+       reviewed by: Matthias Clasen  <mclasen@redhat.com>
+
+       * gdk-pixbuf/Makefile.am:
+       * gdk/Makefile.am:
+       * gtk/Makefile.am: use installation prefixes of dependent libs to
+       crossreference docs (#407146).
+
 2007-01-27  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/sgml/gtkfilesel.sgml: Add deprecation information.

diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
index 718c192a415c2818385a1c7abc2ea6460ffa67ed..6660a0f9c138a04e86a8ee70e0f1add50795affc 100644 (file)
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ b/docs/reference/gdk-pixbuf/Makefile.am
@@ -62,7 +62,9 @@ content_files =                               \
 HTML_IMAGES = composite.png
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=
+FIXXREF_OPTIONS= --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib
+
 
 include $(top_srcdir)/gtk-doc.make
 

diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
index 508af36af1316b78ecd5953649a19f327d6788a6..ccbfffcee563b0780845375faa1245ca35c2eed2 100644 (file)
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -143,7 +143,11 @@ HTML_IMAGES =                              \
        images/xterm.png 
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html
+FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+       --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
+
 
 include $(top_srcdir)/gtk-doc.make
 

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index 216fdbf861d3d12c71bb7ee225937cd42805ecf2..8088be3040195182b3ce14f06e0cc19c27339589 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -307,7 +307,12 @@ HTML_IMAGES = \
        $(srcdir)/images/window.png
 
 # Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
+FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+       --extra-dir=$(ATK_PREFIX)/share/gtk-doc/html/atk \
+       --extra-dir=$(PANGO_PREFIX)/share/gtk-doc/html/pango \
+       --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
 
 include $(top_srcdir)/gtk-doc.make