From ffcc7dc99239b09f61118f0301f96904c2b2062d Mon Sep 17 00:00:00 2001 From: David Schleef Date: Sun, 13 May 2007 20:28:14 +0000 Subject: [PATCH] docs/Makefile.am: the gtk-doc makefile snippet correctly handles the case when ENABLE_GTK_DOC is false, and installs ... 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. --- ChangeLog | 7 +++++++ docs/Makefile.am | 14 +------------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index a77c74aa47..2410034f38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-05-13 David Schleef + + * 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 * gst/gstutils.h: Reword some documentation. diff --git a/docs/Makefile.am b/docs/Makefile.am index bd8708a157..85cc087862 100644 --- 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 = \