/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to Makefile

  • Committer: John Arbash Meinel
  • Date: 2007-12-18 19:04:38 UTC
  • mfrom: (3123.1.3 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 3126.
  • Revision ID: john@arbash-meinel.com-20071218190438-sq0itdz00lu5cm5h
Merge in bzr.dev and the one_one deprecation string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
75
75
ifdef PRETTY
76
76
rst2html := $(PYTHON) tools/rst2prettyhtml.py doc/bazaar-vcs.org.kid 
77
77
else
78
 
rst2html := $(PYTHON) tools/rst2html.py --link-stylesheet --footnote-references=superscript 
 
78
rst2html := $(PYTHON) tools/rst2html.py --link-stylesheet --footnote-references=superscript --halt=warning
79
79
endif
80
80
 
81
81
# translate txt docs to html
87
87
txt_files := $(wildcard $(addsuffix /*.txt, $(doc_dir))) $(derived_txt_files) \
88
88
        doc/en/user-guide/index.txt \
89
89
        doc/en/mini-tutorial/index.txt \
90
 
        doc/en/user-reference/hooks.txt \
91
90
        doc/index.txt
92
91
non_txt_files := \
93
92
       doc/default.css \
114
113
MAN_DEPENDENCIES = bzrlib/builtins.py \
115
114
                 bzrlib/bundle/commands.py \
116
115
                 bzrlib/conflicts.py \
117
 
                 bzrlib/help_topics.py \
 
116
                 bzrlib/help_topics/__init__.py \
118
117
                 bzrlib/sign_my_commits.py \
 
118
                 bzrlib/bugtracker.py \
119
119
                 generate_docs.py \
120
120
                 tools/doc_generate/__init__.py \
121
121
                 tools/doc_generate/autodoc_man.py \
122
 
                 tools/doc_generate/autodoc_rstx.py
 
122
                 tools/doc_generate/autodoc_rstx.py \
 
123
                 $(wildcard $(addsuffix /*.txt, bzrlib/help_topics/en)) 
123
124
 
124
125
doc/en/user-reference/bzr_man.txt: $(MAN_DEPENDENCIES)
125
126
        $(PYTHON) generate_docs.py -o $@ rstx