Add crossreferences to glib/gobject docs.

Original commit message from CVS:
* configure.ac:
* docs/gst/Makefile.am:
* docs/libs/Makefile.am:
* docs/plugins/Makefile.am:
Add crossreferences to glib/gobject docs.

diff --git a/ChangeLog b/ChangeLog
index 6957ca8..8eb354c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-2007-02-12  Wim Taymans,,,  <wim@fluendo.com>
+2007-02-12  Stefan Kost  <ensonic@users.sf.net>
+
+       * configure.ac:
+       * docs/gst/Makefile.am:
+       * docs/libs/Makefile.am:
+       * docs/plugins/Makefile.am:
+         Add crossreferences to glib/gobject docs.
+
+2007-02-12  Wim Taymans  <wim@fluendo.com>
 
        * docs/design/draft-latency.txt:
        Small update.
@@ -122,7 +130,7 @@
          The klass string is not a hierarchy. Add reference to the design doc
          for more information and common types.
 
-2007-02-02  Wim Taymans,,,  <wim@fluendo.com>
+2007-02-02  Wim Taymans  <wim@fluendo.com>
 
        * gst/gstquery.c: (gst_query_new_latency):
        Remove old structure field.

diff --git a/configure.ac b/configure.ac
index 6a81539..1a4f804 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -383,7 +383,7 @@ INET_ATON_LIBS=$LIBS
 AC_SUBST(INET_ATON_LIBS)
 LIBS="$save_libs"
 
-dnl *** checks for dependancy libraries ***
+dnl *** checks for dependency libraries ***
 
 dnl GLib
 
@@ -395,7 +395,11 @@ AC_SUBST(GST_HAVE_GLIB_2_8_DEFINE)
 
 dnl Check for glib2 without extra fat, useful for the unversioned tool frontends
 PKG_CHECK_MODULES(GLIB_ONLY, glib-2.0 >= $GLIB_REQ)
-  
+
+dnl Checks for documentation xrefs
+GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
+AC_SUBST(GLIB_PREFIX)
+
 dnl libxml 2, which is/should be optional (FIXME)
 dnl (FIXME) if we use binary registry, the DISABLE_REGISTRY check need to go
 if test "x$GST_DISABLE_LOADSAVE" = "xyes" && \

diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am
index bf21d79..cc10967 100644 (file)
--- a/docs/gst/Makefile.am
+++ b/docs/gst/Makefile.am
@@ -42,7 +42,8 @@ SCAN_OPTIONS=--deprecated-guards="GST_DISABLE_DEPRECATED"
 MKDB_OPTIONS=--sgml-mode --ignore-files=parse
 
 # Extra options to supply to gtkdoc-fixref.
-FIXXREF_OPTIONS=
+FIXXREF_OPTIONS=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib
 
 # The files containing the source code. Relative to $(top_srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments

diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am
index 461a0ea..29913ed 100644 (file)
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -51,7 +51,9 @@ SCAN_OPTIONS=--deprecated-guards="GST_DISABLE_DEPRECATED"
 MKDB_OPTIONS= --output-format=xml --sgml-mode --ignore-files=trio
 
 # Extra options to supply to gtkdoc-fixref.
-FIXXREF_OPTIONS=--extra-dir=$(datadir)/gtk-doc/html/gstreamer-@GST_MAJORMINOR@
+FIXXREF_OPTIONS=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+       --extra-dir=$(datadir)/gtk-doc/html/gstreamer-@GST_MAJORMINOR@
 
 # Used for dependencies.
 HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*.h

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 6199de7..74a2392 100644 (file)
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -48,8 +48,10 @@ SCAN_OPTIONS=
 MKDB_OPTIONS=--sgml-mode
 
 # Extra options to supply to gtkdoc-fixref.
-# FIXME get the location of the installed gstreamer docs
-#FIXXREF_OPTIONS=--extra-dir=../gst/html
+FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+       --extra-dir=$(datadir)/gtk-doc/html/gstreamer-@GST_MAJORMINOR@ \
+       --extra-dir=$(datadir)/gtk-doc/html/gstreamer-libs-@GST_MAJORMINOR@
 
 # Used for dependencies.
 HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*.h