docs/: Simplity --extra-dir as gtkdoc scans recursively.

Original commit message from CVS:
* docs/gst/Makefile.am:
* docs/libs/Makefile.am:
* docs/plugins/Makefile.am:
Simplity --extra-dir as gtkdoc scans recursively.

diff --git a/ChangeLog b/ChangeLog
index bf48d51..13dd047 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-05  Stefan Kost  <ensonic@users.sf.net>
+
+       * docs/gst/Makefile.am:
+       * docs/libs/Makefile.am:
+       * docs/plugins/Makefile.am:
+         Simplity --extra-dir as gtkdoc scans recursively.
+
 2007-07-03  Wim Taymans  <wim.taymans@gmail.com>
 
        * tools/gst-launch.c: (main):

diff --git a/docs/gst/Makefile.am b/docs/gst/Makefile.am
index 1f42ee8..8355b55 100644 (file)
--- a/docs/gst/Makefile.am
+++ b/docs/gst/Makefile.am
@@ -42,8 +42,7 @@ SCAN_OPTIONS=--deprecated-guards="GST_DISABLE_DEPRECATED"
 MKDB_OPTIONS=--sgml-mode --ignore-files=parse
 
 # Extra options to supply to gtkdoc-fixref.
-FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
-       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib
+FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html
 
 # 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 5e1aaf3..96d90f7 100644 (file)
--- a/docs/libs/Makefile.am
+++ b/docs/libs/Makefile.am
@@ -51,9 +51,8 @@ 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=$(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@
+FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html \
+       --extra-dir=$(datadir)/gtk-doc/html
 
 # Used for dependencies.
 HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*.h

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index e1eae80..5672c35 100644 (file)
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -48,10 +48,8 @@ SCAN_OPTIONS=
 MKDB_OPTIONS=--sgml-mode
 
 # Extra options to supply to gtkdoc-fixref.
-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@
+FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html \
+       --extra-dir=$(datadir)/gtk-doc/html
 
 # Used for dependencies.
 HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*.h