Drizzle

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

  1. drizzle-fix-make-clean-for-docs
  2. Merge into development
Proposed by Henrik Ingo
Status: Merged
Approved by: Brian Aker
Approved revision: 2427
Merged at revision: 2428
Proposed branch: lp:~hingo/drizzle/drizzle-fix-make-clean-for-docs
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 42 lines (+21/-0)
2 files modified
.bzrignore (+15/-0)
Makefile.am (+6/-0)
To merge this branch: bzr merge lp:~hingo/drizzle/drizzle-fix-make-clean-for-docs
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+77795@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2011-08-04 08:13:04 +0000
+++ .bzrignore 2011-10-01 17:06:39 +0000
@@ -344,7 +344,22 @@
344virtual_column_info.gcno344virtual_column_info.gcno
345xid.gcno345xid.gcno
346ylwrap346ylwrap
347docs/html
348docs/dirhtml
349docs/singlehtml
350docs/pickle
351docs/json
352docs/htmlhelp
353docs/qthelp
354docs/devhelp
355docs/epub
356docs/latex
357docs/latexpdf
358docs/text
347docs/man359docs/man
360docs/changes
361docs/linkcheck
362docs/doctest
348.pc363.pc
349drizzled/message/catalog.pb.cc364drizzled/message/catalog.pb.cc
350drizzled/message/catalog.pb.h365drizzled/message/catalog.pb.h
351366
=== 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 @@
142clean-local:142clean-local:
143 find . -name '*.gcno' | xargs rm -f143 find . -name '*.gcno' | xargs rm -f
144 -rm -rf docs/api docs/dev docs/_build docs/doctrees144 -rm -rf docs/api docs/dev docs/_build docs/doctrees
145 rm -Rf $(SPHINX_BUILDDIR)/html $(SPHINX_BUILDDIR)/dirhtml $(SPHINX_BUILDDIR)/singlehtml \
146 $(SPHINX_BUILDDIR)/pickle $(SPHINX_BUILDDIR)/json $(SPHINX_BUILDDIR)/htmlhelp \
147 $(SPHINX_BUILDDIR)/qthelp $(SPHINX_BUILDDIR)/devhelp $(SPHINX_BUILDDIR)/epub \
148 $(SPHINX_BUILDDIR)/latex $(SPHINX_BUILDDIR)/latexpdf $(SPHINX_BUILDDIR)/text \
149 $(SPHINX_BUILDDIR)/man $(SPHINX_BUILDDIR)/changes $(SPHINX_BUILDDIR)/linkcheck \
150 $(SPHINX_BUILDDIR)/doctest
145151
146include config/lcov.am152include config/lcov.am
147153