From d03f78d47f23f9e376667ede12b1db0756697b57 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 5 Jul 2007 08:43:30 +0000 Subject: [PATCH] docs/: Simplify --extra-dir as gtkdoc scans recursively. Original commit message from CVS: * docs/libs/Makefile.am: * docs/plugins/Makefile.am: Simplify --extra-dir as gtkdoc scans recursively. --- ChangeLog | 6 ++++++ docs/libs/Makefile.am | 6 ++---- docs/plugins/Makefile.am | 8 +++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90797c0..5e56fed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-07-05 Stefan Kost + + * docs/libs/Makefile.am: + * docs/plugins/Makefile.am: + Simplify --extra-dir as gtkdoc scans recursively. + 2007-07-03 Wim Taymans * gst/adder/gstadder.c: (gst_adder_sink_getcaps), diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index 8ec96d3..42ec27a 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -54,10 +54,8 @@ SCAN_OPTIONS= MKDB_OPTIONS=--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=$(GST_PREFIX)/share/gtk-doc/html/gstreamer-@GST_MAJORMINOR@ \ - --extra-dir=$(GST_PREFIX)/share/gtk-doc/html/gstreamer-libs-@GST_MAJORMINOR@ +FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html \ + --extra-dir=$(GST_PREFIX)/share/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 3ac163d..762d618 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -48,11 +48,9 @@ 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=$(GST_PREFIX)/share/gtk-doc/html/gstreamer-@GST_MAJORMINOR@ \ - --extra-dir=$(GST_PREFIX)/share/gtk-doc/html/gstreamer-libs-@GST_MAJORMINOR@ \ - --extra-dir=$(datadir)/gtk-doc/html/gst-plugins-base-libs-@GST_MAJORMINOR@ +FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html \ + --extra-dir=$(GST_PREFIX)/share/gtk-doc/html \ + --extra-dir=$(datadir)/gtk-doc/html # Used for dependencies. HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.h -- 2.7.4