Merge lp:~hingo/drizzle/drizzle-fix-make-clean-for-docs into lp:~drizzle-trunk/drizzle/development

[Henrik Ingo]

Add the directories output by various sphinx make targets to
.bzrignore and make clean.

=== modified file '.bzrignore'
--- .bzrignore	2011-08-04 08:13:04 +0000
+++ .bzrignore	2011-10-01 17:06:39 +0000
@@ -344,7 +344,22 @@
 virtual_column_info.gcno
 xid.gcno
 ylwrap
+docs/html
+docs/dirhtml
+docs/singlehtml
+docs/pickle
+docs/json
+docs/htmlhelp
+docs/qthelp
+docs/devhelp
+docs/epub
+docs/latex
+docs/latexpdf
+docs/text
 docs/man
+docs/changes
+docs/linkcheck
+docs/doctest
 .pc
 drizzled/message/catalog.pb.cc
 drizzled/message/catalog.pb.h

=== modified file 'Makefile.am'
--- Makefile.am	2011-08-16 01:07:54 +0000
+++ Makefile.am	2011-10-01 17:06:39 +0000
@@ -142,6 +142,12 @@
 clean-local:
 	find . -name '*.gcno' | xargs rm -f
 	-rm -rf docs/api docs/dev docs/_build docs/doctrees
+	rm -Rf $(SPHINX_BUILDDIR)/html $(SPHINX_BUILDDIR)/dirhtml $(SPHINX_BUILDDIR)/singlehtml \
+	$(SPHINX_BUILDDIR)/pickle $(SPHINX_BUILDDIR)/json $(SPHINX_BUILDDIR)/htmlhelp \
+	$(SPHINX_BUILDDIR)/qthelp $(SPHINX_BUILDDIR)/devhelp $(SPHINX_BUILDDIR)/epub \
+	$(SPHINX_BUILDDIR)/latex $(SPHINX_BUILDDIR)/latexpdf $(SPHINX_BUILDDIR)/text \
+	$(SPHINX_BUILDDIR)/man $(SPHINX_BUILDDIR)/changes $(SPHINX_BUILDDIR)/linkcheck \
+	$(SPHINX_BUILDDIR)/doctest
 
 include config/lcov.am