summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2006-06-16 10:56:24 +0000
committerTim-Philipp Müller <tim@centricular.net>2006-06-16 10:56:24 +0000
commit16e1c0ad3d51c2f3e2b8319f4f9ad2b7f143b1f6 (patch)
treed8ab00599a5497c784f768aba5e243da1abd588d
parent2787798482ac6d03363b99a8325840d01ceb9d34 (diff)
Use GST_PLUGIN_DOCS, --enable-plugin-docs etc.
Original commit message from CVS: * autogen.sh: * configure.ac: * docs/Makefile.am: Use GST_PLUGIN_DOCS, --enable-plugin-docs etc. * docs/plugins/Makefile.am: * docs/plugins/gst-plugins-good-plugins-docs.sgml: * docs/plugins/inspect/plugin-taglib.xml: Add/fix apev2mux docs.
-rw-r--r--ChangeLog12
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac1
-rw-r--r--docs/Makefile.am8
-rw-r--r--docs/plugins/Makefile.am1
-rw-r--r--docs/plugins/inspect/plugin-taglib.xml11
6 files changed, 28 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a260252..9d2548f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-06-16 Tim-Philipp Müller <tim at centricular dot net>
+
+ * autogen.sh:
+ * configure.ac:
+ * docs/Makefile.am:
+ Use GST_PLUGIN_DOCS, --enable-plugin-docs etc.
+
+ * docs/plugins/Makefile.am:
+ * docs/plugins/gst-plugins-good-plugins-docs.sgml:
+ * docs/plugins/inspect/plugin-taglib.xml:
+ Add/fix apev2mux docs.
+
2006-06-14 Wim Taymans <wim@fluendo.com>
* ext/dv/gstdvdec.c: (gst_dvdec_class_init), (gst_dvdec_init),
diff --git a/autogen.sh b/autogen.sh
index 152a2f5f..895531ac 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -25,7 +25,7 @@ then
fi
. common/gst-autogen.sh
-CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-gtk-doc'
+CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-gtk-doc --enable-plugin-docs'
autogen_options $@
diff --git a/configure.ac b/configure.ac
index 14aaa8ad..f267a818 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,6 +184,7 @@ AM_GCONF_SOURCE_2
dnl check for documentation tools
GTK_DOC_CHECK([1.3])
AS_PATH_PYTHON([2.1])
+GST_PLUGIN_DOCS([1.3],[2.1])
dnl *** checks for libraries ***
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 811eaa98..baeaceb0 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,10 +1,10 @@
-if ENABLE_GTK_DOC
-GTK_DOC_DIRS = plugins
+if ENABLE_PLUGIN_DOCS
+PLUGIN_DOCS_DIRS = plugins
else
-GTK_DOC_DIRS =
+PLUGIN_DOCS_DIRS =
endif
-SUBDIRS = $(GTK_DOC_DIRS)
+SUBDIRS = $(PLUGIN_DOCS_DIRS)
DIST_SUBDIRS = plugins
EXTRA_DIST = \
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index d7aae37e..6e3589f7 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -96,6 +96,7 @@ EXTRA_HFILES = \
$(top_srcdir)/ext/jpeg/gstsmokeenc.h \
$(top_srcdir)/ext/taglib/gsttaglibmux.h \
$(top_srcdir)/ext/taglib/gstid3v2mux.h \
+ $(top_srcdir)/ext/taglib/gstapev2mux.h \
$(top_srcdir)/gst/multipart/multipartmux.c \
$(top_srcdir)/gst/multipart/multipartdemux.c \
$(top_srcdir)/gst/udp/gstudpsrc.h \
diff --git a/docs/plugins/inspect/plugin-taglib.xml b/docs/plugins/inspect/plugin-taglib.xml
index d5d7f1a4..5e3d40b7 100644
--- a/docs/plugins/inspect/plugin-taglib.xml
+++ b/docs/plugins/inspect/plugin-taglib.xml
@@ -3,13 +3,20 @@
<description>Tag writing plug-in based on taglib</description>
<filename>../../ext/taglib/.libs/libgsttaglib.so</filename>
<basename>libgsttaglib.so</basename>
- <version>0.10.3</version>
+ <version>0.10.3.1</version>
<license>LGPL</license>
<source>gst-plugins-good</source>
- <package>GStreamer Good Plug-ins source release</package>
+ <package>GStreamer Good Plug-ins CVS/prerelease</package>
<origin>Unknown package origin</origin>
<elements>
<element>
+ <name>apev2mux</name>
+ <longname>TagLib-based APEv2 Muxer</longname>
+ <class>Formatter/Metadata</class>
+ <description>Adds an APEv2 header to the beginning of files using taglib</description>
+ <author>Sebastian Dröge &lt;mail@slomosnail.de&gt;</author>
+ </element>
+ <element>
<name>id3v2mux</name>
<longname>TagLib-based ID3v2 Muxer</longname>
<class>Formatter/Metadata</class>