diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index d675392968..3712255060 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,12 @@ +2007-02-14 Stefan Kost + + reviewed by: Matthias Clasen + + * 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 * gtk/sgml/gtkfilesel.sgml: Add deprecation information. diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am index 718c192a41..6660a0f9c1 100644 --- 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 508af36af1..ccbfffcee5 100644 --- 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 216fdbf861..8088be3040 100644 --- 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