Index: docs/Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gstreamer/docs/Makefile.am,v
retrieving revision 1.44
diff -u -r1.44 Makefile.am
--- docs/Makefile.am	21 May 2008 15:54:28 -0000	1.44
+++ docs/Makefile.am	27 May 2008 12:35:46 -0000
@@ -1,22 +1,18 @@
-if ENABLE_DOCBOOK
-SUBDIRS_DOCBOOK = faq manual pwg
-else
-SUBDIRS_DOCBOOK =
-endif
-
 if ENABLE_GTK_DOC
-if ENABLE_PLUGIN_DOCS
-PLUGIN_DOCS_DIRS = plugins
+SUBDIRS_GTK_DOC = gst libs plugins
 else
-PLUGIN_DOCS_DIRS =
+SUBDIRS_GTK_DOC =
 endif
+
+if ENABLE_DOCBOOK
+SUBDIRS_DOCBOOK = faq manual pwg
 else
-PLUGIN_DOCS_DIRS = plugins
+SUBDIRS_DOCBOOK =
 endif
 
 BUILT_SOURCES = version.entities
 
-SUBDIRS = design gst libs $(PLUGIN_DOCS_DIRS) $(SUBDIRS_DOCBOOK)
+SUBDIRS = design $(SUBDIRS_GTK_DOC) $(SUBDIRS_DOCBOOK)
 DIST_SUBDIRS = design gst libs plugins faq manual pwg slides xsl
 
 EXTRA_DIST = \
