[gst-cvs] ensonic gst-plugins-good: gst-plugins-good/ gst-plugins-good/docs/plugins/

[<en...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-good
Changes by:     ensonic
Date:           Tue Feb 13 2007  09:46:38 UTC

Log message:
* configure.ac:
* docs/plugins/Makefile.am:
Add crossreferences to glib/gobject/gstream docs.

Modified files:
    .               : ChangeLog configure.ac
    docs/plugins    : Makefile.am

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.2733&r2=1.2734
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/configure.ac.diff?r1=1.685&r2=1.686
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/docs/plugins/Makefile.am.diff?r1=1.32&r2=1.33

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v
retrieving revision 1.2733
retrieving revision 1.2734
diff -u -d -r1.2733 -r1.2734
--- ChangeLog	12 Feb 2007 23:35:15 -0000	1.2733
+++ ChangeLog	13 Feb 2007 09:46:25 -0000	1.2734
@@ -1,3 +1,9 @@
+2007-02-13  Stefan Kost  <en...@us...>
+
+	* 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:
Index: configure.ac
RCS file: /cvs/gstreamer/gst-plugins-good/configure.ac,v
retrieving revision 1.685
retrieving revision 1.686
diff -u -d -r1.685 -r1.686
--- configure.ac	11 Feb 2007 10:53:21 -0000	1.685
+++ configure.ac	13 Feb 2007 09:46:25 -0000	1.686
@@ -236,7 +236,7 @@
 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 @@
 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)
Index: Makefile.am
RCS file: /cvs/gstreamer/gst-plugins-good/docs/plugins/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Makefile.am	7 Feb 2007 20:39:16 -0000	1.32
+++ Makefile.am	13 Feb 2007 09:46:26 -0000	1.33
@@ -48,8 +48,11 @@
 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