From 5b1d0e924955cb11090352b26810da1049ff3f22 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 28 Feb 2020 15:36:17 +0000 Subject: [PATCH] docs: Stop building qemu-doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Alex Bennée Tested-by: Alex Bennée Message-id: 20200228153619.9906-32-peter.maydell@linaro.org --- .gitignore | 3 --- Makefile | 39 ++++--------------------------------- docs/index.html.in | 1 - docs/specs/ivshmem-spec.txt | 4 ++-- 4 files changed, 6 insertions(+), 41 deletions(-) diff --git a/.gitignore b/.gitignore index bc0a035f9c..0c5af83aa7 100644 --- a/.gitignore +++ b/.gitignore @@ -46,9 +46,6 @@ !/qapi/qapi-visit-core.c /qapi/qapi-visit.[ch] /qapi/qapi-doc.texi -/qemu-doc.html -/qemu-doc.info -/qemu-doc.txt /qemu-edid /qemu-img /qemu-nbd diff --git a/Makefile b/Makefile index ef10b9a031..9d4b224126 100644 --- a/Makefile +++ b/Makefile @@ -344,7 +344,6 @@ MANUAL_BUILDDIR := docs endif ifdef BUILD_DOCS -DOCS=qemu-doc.html qemu-doc.txt DOCS+=$(MANUAL_BUILDDIR)/system/qemu.1 DOCS+=$(MANUAL_BUILDDIR)/tools/qemu-img.1 DOCS+=$(MANUAL_BUILDDIR)/tools/qemu-nbd.8 @@ -768,10 +767,6 @@ distclean: clean rm -f $(SUBDIR_DEVICES_MAK) rm -f po/*.mo tests/qemu-iotests/common.env 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 config.log rm -f linux-headers/asm @@ -851,8 +846,6 @@ install-sphinxdocs: sphinxdocs install-doc: $(DOCS) install-sphinxdocs $(INSTALL_DIR) "$(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.txt "$(DESTDIR)$(qemu_docdir)" 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 @cp -p $< $@ -html: qemu-doc.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 -pdf: qemu-doc.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 - -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 +html: docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html sphinxdocs +info: docs/interop/qemu-qmp-ref.info docs/interop/qemu-ga-ref.info +pdf: docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf +txt: docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.dvi docs/interop/qemu-ga-ref.html \ docs/interop/qemu-ga-ref.info docs/interop/qemu-ga-ref.pdf \ diff --git a/docs/index.html.in b/docs/index.html.in index a576ace8a2..cc19aad2ec 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -7,7 +7,6 @@

QEMU @@VERSION@@ Documentation

    -
  • User Documentation
  • QMP Reference Manual
  • Guest Agent Protocol Reference
  • System Emulation Management and Interoperability Guide
    • diff --git a/docs/specs/ivshmem-spec.txt b/docs/specs/ivshmem-spec.txt index 042f7eae22..1beb3a01ec 100644 --- a/docs/specs/ivshmem-spec.txt +++ b/docs/specs/ivshmem-spec.txt @@ -38,8 +38,8 @@ There are two basic configurations: Interrupts are message-signaled (MSI-X). vectors=N configures the number of vectors to use. -For more details on ivshmem device properties, see The QEMU Emulator -User Documentation (qemu-doc.*). +For more details on ivshmem device properties, see the QEMU Emulator +user documentation. == The ivshmem PCI device's guest interface ==