← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to Makefile

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile
139
139
        doc/developers/Makefile \
140
140
        doc/developers/make.bat
141
141
 
 
142
NEWS_FILES = $(wildcard doc/en/release-notes/bzr-*.txt)
 
143
 
142
144
doc/en/user-reference/index.txt: $(MAN_DEPENDENCIES)
143
145
        $(PYTHON) tools/generate_docs.py -o $@ rstx
144
146
 
145
 
doc/en/release-notes/index.txt: NEWS tools/generate_release_notes.py
146
 
        $(PYTHON) tools/generate_release_notes.py NEWS $@
 
147
doc/en/release-notes/index.txt: $(NEWS_FILES) tools/generate_release_notes.py
 
148
        $(PYTHON) tools/generate_release_notes.py $@ $(NEWS_FILES)
147
149
 
148
150
doc/%/Makefile: doc/en/Makefile
149
151
        $(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')"
302
304
        $(rst2html) --stylesheet=default.css $< $@
303
305
 
304
306
%.html: %.txt
305
 
        $(rst2html) --stylesheet=../../default.css $< $@
 
307
        $(rst2html) --stylesheet=../../default.css $< "$@"
306
308
 
307
 
doc/en/release-notes/NEWS.txt: NEWS
308
 
        $(PYTHON) -c "import shutil; shutil.copyfile('$<', '$@')"
 
309
doc/en/release-notes/NEWS.txt: $(NEWS_FILES) tools/generate_release_notes.py
 
310
        $(PYTHON) tools/generate_release_notes.py "$@" $(NEWS_FILES)
309
311
 
310
312
upgrade_guide_dependencies =  $(wildcard $(addsuffix /*.txt, doc/en/upgrade-guide)) 
311
313