Add crossreferences to glib/gobject/gstream docs.

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

diff --git a/ChangeLog b/ChangeLog
index 5553a5ad7c3f3390773ec27af4d06f3ccb75950d..92ef51d7f05d0b2752d38b908943d076ed440f83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-13  Stefan Kost  <ensonic@users.sf.net>
+
+       * configure.ac:
+       * docs/plugins/Makefile.am:
+         Add crossreferences to glib/gobject/gstream docs.
+
 2007-02-12  Tim-Philipp Müller  <tim at centricular dot net>
 
        * gst/monoscope/Makefile.am:

diff --git a/configure.ac b/configure.ac
index 0bb1f37219d279db35a1275d820d8044a0c55484..c1e283358a6f8ef933ae1b85c213df9de3f0aeb0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -236,7 +236,7 @@ dnl Check for mmap (needed by electricfence plugin)
 AC_FUNC_MMAP
 AM_CONDITIONAL(GST_HAVE_MMAP, test "x$ac_cv_func_mmap_fixed_mapped" == "xyes")
 
-dnl *** checks for dependancy libraries ***
+dnl *** checks for dependency libraries ***
 
 dnl GLib is required
 GST_GLIB_CHECK([2.6])
@@ -270,6 +270,14 @@ dnl check for "check", unit testing library/header
 AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no)
 AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes")
 
+dnl Check for documentation xrefs
+GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
+GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_MAJORMINOR`"
+GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_MAJORMINOR`"
+AC_SUBST(GLIB_PREFIX)
+AC_SUBST(GST_PREFIX)
+AC_SUBST(GSTPB_PREFIX)
+
 dnl GTK is optional and used in examples
 HAVE_GTK=NO
 PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, HAVE_GTK_22=yes, HAVE_GTK_22=no)

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 936e4e2d990dae540bf754baf124e5095fa1ec1a..640edbbb2d535375c723598bf9401b0b0cdf920f 100644 (file)
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -48,8 +48,11 @@ SCAN_OPTIONS=
 MKDB_OPTIONS=--sgml-mode --source-suffixes=c,h,cc
 
 # 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=$(GST_PREFIX)/share/gtk-doc/html/gstreamer-@GST_MAJORMINOR@ \
+       --extra-dir=$(GST_PREFIX)/share/gtk-doc/html/gstreamer-libs-@GST_MAJORMINOR@ \
+       --extra-dir=$(GSTPB_PREFIX)/share/gtk-doc/html/gst-plugins-base-libs-@GST_MAJORMINOR@
 
 # Used for dependencies.
 HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.h