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

Proposed by Henrik Ingo on 2011-10-01
Status: Merged
Approved by: Brian Aker on 2011-10-04
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 2011-10-01 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
1=== modified file '.bzrignore'
2--- .bzrignore 2011-08-04 08:13:04 +0000
3+++ .bzrignore 2011-10-01 17:06:39 +0000
4@@ -344,7 +344,22 @@
5 virtual_column_info.gcno
6 xid.gcno
7 ylwrap
8+docs/html
9+docs/dirhtml
10+docs/singlehtml
11+docs/pickle
12+docs/json
13+docs/htmlhelp
14+docs/qthelp
15+docs/devhelp
16+docs/epub
17+docs/latex
18+docs/latexpdf
19+docs/text
20 docs/man
21+docs/changes
22+docs/linkcheck
23+docs/doctest
24 .pc
25 drizzled/message/catalog.pb.cc
26 drizzled/message/catalog.pb.h
27
28=== modified file 'Makefile.am'
29--- Makefile.am 2011-08-16 01:07:54 +0000
30+++ Makefile.am 2011-10-01 17:06:39 +0000
31@@ -142,6 +142,12 @@
32 clean-local:
33 find . -name '*.gcno' | xargs rm -f
34 -rm -rf docs/api docs/dev docs/_build docs/doctrees
35+ rm -Rf $(SPHINX_BUILDDIR)/html $(SPHINX_BUILDDIR)/dirhtml $(SPHINX_BUILDDIR)/singlehtml \
36+ $(SPHINX_BUILDDIR)/pickle $(SPHINX_BUILDDIR)/json $(SPHINX_BUILDDIR)/htmlhelp \
37+ $(SPHINX_BUILDDIR)/qthelp $(SPHINX_BUILDDIR)/devhelp $(SPHINX_BUILDDIR)/epub \
38+ $(SPHINX_BUILDDIR)/latex $(SPHINX_BUILDDIR)/latexpdf $(SPHINX_BUILDDIR)/text \
39+ $(SPHINX_BUILDDIR)/man $(SPHINX_BUILDDIR)/changes $(SPHINX_BUILDDIR)/linkcheck \
40+ $(SPHINX_BUILDDIR)/doctest
41
42 include config/lcov.am
43