diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2006-06-16 09:56:41 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2006-06-16 09:56:41 +0000 |
| commit | 56135ebeb0ec94519036adbdf1da11b58965d708 (patch) | |
| tree | f4c86026cfaaa2bfa34a2d3ddda7b8ab006637ed | |
| parent | d609b0f7c5bae0fdb2e572add8b89692fb8c8805 (diff) | |
Use GST_PLUGIN_DOCS macro in configure.ac, add
Original commit message from CVS:
* autogen.sh:
* configure.ac:
* docs/Makefile.am:
Use GST_PLUGIN_DOCS macro in configure.ac, add
--enable-plugin-docs default to autogen.sh and use
ENABLE_PLUGIN_DOCS conditional in Makefile.am (#344039).
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | docs/Makefile.am | 10 |
5 files changed, 19 insertions, 3 deletions
@@ -1,3 +1,12 @@ +2006-06-16 Tim-Philipp Müller <tim at centricular dot net> + + * autogen.sh: + * configure.ac: + * docs/Makefile.am: + Use GST_PLUGIN_DOCS macro in configure.ac, add + --enable-plugin-docs default to autogen.sh and use + ENABLE_PLUGIN_DOCS conditional in Makefile.am (#344039). + 2006-06-15 Wim Taymans <wim@fluendo.com> * ext/ogg/gstoggdemux.c: (gst_ogg_demux_chain_peer), @@ -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/common b/common -Subproject dd85f550441bd5722b98f4dd304e40826383240 +Subproject bbfa0146961f4ca61ddbca7b42360b5741a6354 diff --git a/configure.ac b/configure.ac index 3f3944a8..7019f60d 100644 --- a/configure.ac +++ b/configure.ac @@ -155,6 +155,7 @@ AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno") 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 b1feeb83..043152f8 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,10 +1,16 @@ if ENABLE_GTK_DOC -GTK_DOC_DIRS = libs plugins +GTK_DOC_DIRS = libs else GTK_DOC_DIRS = endif -SUBDIRS = $(GTK_DOC_DIRS) +if ENABLE_PLUGIN_DOCS +PLUGIN_DOCS_DIRS = plugins +else +PLUGIN_DOCS_DIRS = +endif + +SUBDIRS = $(GTK_DOC_DIRS) $(PLUGIN_DOCS_DIRS) DIST_SUBDIRS = libs plugins EXTRA_DIST = \ |