docs/Makefile.am: the gtk-doc makefile snippet correctly handles the case when ENABLE...

Original commit message from CVS:
* docs/Makefile.am: the gtk-doc makefile snippet correctly
handles the case when ENABLE_GTK_DOC is false, and installs
the prebuilt documentation.  So gtk-doc subdirs are
unconditionally enabled.  Fixes: #349099.

diff --git a/ChangeLog b/ChangeLog
index a77c74a..2410034 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-05-13  David Schleef  <ds@schleef.org>
 
+       * docs/Makefile.am: the gtk-doc makefile snippet correctly
+         handles the case when ENABLE_GTK_DOC is false, and installs
+         the prebuilt documentation.  So gtk-doc subdirs are 
+         unconditionally enabled.  Fixes: #349099.
+
+2007-05-13  David Schleef  <ds@schleef.org>
+
        * gst/gstutils.h: Reword some documentation.
 
 2007-05-12  David Schleef  <ds@schleef.org>

diff --git a/docs/Makefile.am b/docs/Makefile.am
index bd8708a..85cc087 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,15 +1,3 @@
-if ENABLE_GTK_DOC
-SUBDIRS_GTK_DOC = gst libs
-else
-SUBDIRS_GTK_DOC =
-endif
-
-if ENABLE_PLUGIN_DOCS
-SUBDIRS_PLUGIN_DOCS = plugins
-else
-SUBDIRS_PLUGIN_DOCS =
-endif
-
 if ENABLE_DOCBOOK
 SUBDIRS_DOCBOOK = faq manual pwg
 else
@@ -18,7 +6,7 @@ endif
 
 BUILT_SOURCES = version.entities
 
-SUBDIRS = design $(SUBDIRS_DOCBOOK) $(SUBDIRS_GTK_DOC) $(SUBDIRS_PLUGIN_DOCS)
+SUBDIRS = design gst libs plugins $(SUBDIRS_DOCBOOK)
 DIST_SUBDIRS = design gst libs plugins faq manual pwg slides xsl
 
 EXTRA_DIST = \