OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

docs: Stop building qemu-doc 

Stop building the old texinfo qemu-doc; all its contents are
now available in the Sphinx-generated manuals and manpages.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20200228153619.9906-32-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2020-02-28 15:36:17 +00:00
parent 1879f241e6
commit 5b1d0e9249
4 changed files with 6 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -46,9 +46,6 @@
!/qapi/qapi-visit-core.c !/qapi/qapi-visit-core.c
/qapi/qapi-visit.[ch] /qapi/qapi-visit.[ch]
/qapi/qapi-doc.texi /qapi/qapi-doc.texi
/qemu-doc.html
/qemu-doc.info
/qemu-doc.txt
/qemu-edid /qemu-edid
/qemu-img /qemu-img
/qemu-nbd /qemu-nbd

39
Makefile
View File

@ -344,7 +344,6 @@ MANUAL_BUILDDIR := docs
endif endif
ifdef BUILD_DOCS ifdef BUILD_DOCS
DOCS=qemu-doc.html qemu-doc.txt
DOCS+=$(MANUAL_BUILDDIR)/system/qemu.1 DOCS+=$(MANUAL_BUILDDIR)/system/qemu.1
DOCS+=$(MANUAL_BUILDDIR)/tools/qemu-img.1 DOCS+=$(MANUAL_BUILDDIR)/tools/qemu-img.1
DOCS+=$(MANUAL_BUILDDIR)/tools/qemu-nbd.8 DOCS+=$(MANUAL_BUILDDIR)/tools/qemu-nbd.8
@ -768,10 +767,6 @@ distclean: clean
rm -f $(SUBDIR_DEVICES_MAK) rm -f $(SUBDIR_DEVICES_MAK)
rm -f po/*.mo tests/qemu-iotests/common.env rm -f po/*.mo tests/qemu-iotests/common.env
rm -f roms/seabios/config.mak roms/vgabios/config.mak rm -f roms/seabios/config.mak roms/vgabios/config.mak
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 qemu-doc.txt
rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols
rm -f config.log rm -f config.log
rm -f linux-headers/asm rm -f linux-headers/asm
@ -851,8 +846,6 @@ install-sphinxdocs: sphinxdocs
install-doc: $(DOCS) install-sphinxdocs install-doc: $(DOCS) install-sphinxdocs
$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
$(INSTALL_DATA) $(MANUAL_BUILDDIR)/index.html "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) $(MANUAL_BUILDDIR)/index.html "$(DESTDIR)$(qemu_docdir)"
$(INSTALL_DATA) qemu-doc.html "$(DESTDIR)$(qemu_docdir)"
$(INSTALL_DATA) qemu-doc.txt "$(DESTDIR)$(qemu_docdir)"
$(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) docs/interop/qemu-qmp-ref.html "$(DESTDIR)$(qemu_docdir)"
$(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) docs/interop/qemu-qmp-ref.txt "$(DESTDIR)$(qemu_docdir)"
ifdef CONFIG_POSIX ifdef CONFIG_POSIX
@ -1110,34 +1103,10 @@ docs/interop/qemu-qmp-qapi.texi: qapi/qapi-doc.texi
docs/interop/qemu-ga-qapi.texi: qga/qapi-generated/qga-qapi-doc.texi docs/interop/qemu-ga-qapi.texi: qga/qapi-generated/qga-qapi-doc.texi
@cp -p $< $@ @cp -p $< $@
html: qemu-doc.html docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html sphinxdocs html: docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html sphinxdocs
info: qemu-doc.info docs/interop/qemu-qmp-ref.info docs/interop/qemu-ga-ref.info info: docs/interop/qemu-qmp-ref.info docs/interop/qemu-ga-ref.info
pdf: qemu-doc.pdf docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf pdf: docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf
txt: qemu-doc.txt docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt txt: docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt
qemu-doc.html qemu-doc.info qemu-doc.pdf qemu-doc.txt: \
qemu-options.texi \
qemu-monitor.texi \
qemu-monitor-info.texi \
docs/system/quickstart.texi \
docs/system/invocation.texi \
docs/system/keys.texi \
docs/system/mux-chardev.texi \
docs/system/monitor.texi \
docs/system/cpu-models-x86.texi \
docs/system/images.texi \
docs/system/net.texi \
docs/system/usb.texi \
docs/system/ivshmem.texi \
docs/system/linuxboot.texi \
docs/system/vnc-security.texi \
docs/system/tls.texi \
docs/system/gdb.texi \
docs/system/build-platforms.texi \
docs/system/license.texi \
docs/system/cpu-models-x86.texi docs/system/cpu-models-mips.texi \
docs/system/deprecated.texi docs/system/qemu-option-trace.texi \
docs/system/security.texi
docs/interop/qemu-ga-ref.dvi docs/interop/qemu-ga-ref.html \ docs/interop/qemu-ga-ref.dvi docs/interop/qemu-ga-ref.html \
docs/interop/qemu-ga-ref.info docs/interop/qemu-ga-ref.pdf \ docs/interop/qemu-ga-ref.info docs/interop/qemu-ga-ref.pdf \

1
docs/index.html.in
View File

@ -7,7 +7,6 @@
<body> <body>
<h1>QEMU @@VERSION@@ Documentation</h1> <h1>QEMU @@VERSION@@ Documentation</h1>
<ul> <ul>
<li><a href="qemu-doc.html">User Documentation</a></li>
<li><a href="qemu-qmp-ref.html">QMP Reference Manual</a></li> <li><a href="qemu-qmp-ref.html">QMP Reference Manual</a></li>
<li><a href="qemu-ga-ref.html">Guest Agent Protocol Reference</a></li> <li><a href="qemu-ga-ref.html">Guest Agent Protocol Reference</a></li>
<li><a href="interop/index.html">System Emulation Management and Interoperability Guide</a></li> <li><a href="interop/index.html">System Emulation Management and Interoperability Guide</a></li>

4
docs/specs/ivshmem-spec.txt
View File

@ -38,8 +38,8 @@ There are two basic configurations:
Interrupts are message-signaled (MSI-X). vectors=N configures the Interrupts are message-signaled (MSI-X). vectors=N configures the
number of vectors to use. number of vectors to use.
For more details on ivshmem device properties, see The QEMU Emulator For more details on ivshmem device properties, see the QEMU Emulator
User Documentation (qemu-doc.*). user documentation.
== The ivshmem PCI device's guest interface == == The ivshmem PCI device's guest interface ==