summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorPeter Maydell2017-01-24 15:02:18 +0100
committerPeter Maydell2017-01-24 15:32:05 +0100
commitd5e85105f65e473e48c8696c64d7936dabbfd74e (patch)
tree02e44833fa3c5800312b26b3475582fd11dc85ed /Makefile
parentMerge remote-tracking branch 'remotes/rth/tags/pull-hppa-20170123' into staging (diff)
downloadqemu-d5e85105f65e473e48c8696c64d7936dabbfd74e.tar.gz
qemu-d5e85105f65e473e48c8696c64d7936dabbfd74e.tar.xz
qemu-d5e85105f65e473e48c8696c64d7936dabbfd74e.zip
Makefile: Add qemu-doc.txt to distclean and dependencies
When qemu-doc.txt was added as a new output format in commit f8bab10b4c3f, it was not added to either the list of files to remove in distclean or to the dependency line that forces qemu-options.texi to be built before attempting to build qemu-doc.*. In particular, the missing dependency meant that on some platforms (notably OSX hosts) we would try to build qemu-doc.txt before qemu-options.texi had been fully written out, and then makeinfo would complain about missing cross-reference targets. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1485266538-10119-1-git-send-email-peter.maydell@linaro.org Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9f8968d047..c166d2d3ea 100644
--- a/Makefile
+++ b/Makefile
@@ -393,7 +393,7 @@ distclean: clean
rm -f qemu-doc.info qemu-doc.aux qemu-doc.cp qemu-doc.cps
rm -f qemu-doc.fn qemu-doc.fns qemu-doc.info qemu-doc.ky qemu-doc.kys
rm -f qemu-doc.log qemu-doc.pdf qemu-doc.pg qemu-doc.toc qemu-doc.tp
- rm -f qemu-doc.vr
+ rm -f qemu-doc.vr qemu-doc.txt
rm -f config.log
rm -f linux-headers/asm
rm -f qemu-ga-qapi.texi qemu-qapi.texi
@@ -590,7 +590,7 @@ info: qemu-doc.info docs/qemu-qmp-ref.info docs/qemu-ga-ref.info
pdf: qemu-doc.pdf docs/qemu-qmp-ref.pdf docs/qemu-ga-ref.pdf
txt: qemu-doc.txt docs/qemu-qmp-ref.txt docs/qemu-ga-ref.txt
-qemu-doc.html qemu-doc.info qemu-doc.pdf: \
+qemu-doc.html qemu-doc.info qemu-doc.pdf qemu-doc.txt: \
qemu-img.texi qemu-nbd.texi qemu-options.texi qemu-option-trace.texi \
qemu-monitor.texi qemu-img-cmds.texi qemu-ga.texi \
qemu-monitor-info.texi