qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 39/41] qemu-doc: include version number
Date: Thu, 15 Jun 2017 12:52:59 +0200	[thread overview]
Message-ID: <1497523981-38449-40-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1497523981-38449-1-git-send-email-pbonzini@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 Makefile      | 17 +++++------------
 qemu-doc.texi |  5 +++--
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index c27389a..b017e3a 100644
--- a/Makefile
+++ b/Makefile
@@ -669,33 +669,26 @@ ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \
 MAKEINFO=makeinfo
 MAKEINFOINCLUDES= -I docs -I $(<D) -I $(@D)
 MAKEINFOFLAGS=--no-split --number-sections $(MAKEINFOINCLUDES)
-TEXI2PODFLAGS=$(MAKEINFOINCLUDES)
+TEXI2PODFLAGS=$(MAKEINFOINCLUDES) "-DVERSION=$(VERSION)"
 TEXI2PDFFLAGS=$(if $(V),,--quiet) -I $(SRC_PATH) $(MAKEINFOINCLUDES)
 
 docs/version.texi: $(SRC_PATH)/VERSION
 	$(call quiet-command,echo "@set VERSION $(VERSION)" > $@,"GEN","$@")
 
-%.html: %.texi
+%.html: %.texi docs/version.texi
 	$(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \
 	--html $< -o $@,"GEN","$@")
 
-%.info: %.texi
+%.info: %.texi docs/version.texi
 	$(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) $< -o $@,"GEN","$@")
 
-%.txt: %.texi
+%.txt: %.texi docs/version.texi
 	$(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \
 	--plaintext $< -o $@,"GEN","$@")
 
-%.pdf: %.texi
+%.pdf: %.texi docs/version.texi
 	$(call quiet-command,texi2pdf $(TEXI2PDFFLAGS) $< -o $@,"GEN","$@")
 
-docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.info \
-    docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.pdf \
-    docs/interop/qemu-ga-ref.7.pod: docs/version.texi
-docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.info \
-    docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.pdf \
-    docs/interop/qemu-qmp-ref.pod: docs/version.texi
-
 qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
 	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@")
 
diff --git a/qemu-doc.texi b/qemu-doc.texi
index 965ba59..21079fd 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -1,11 +1,12 @@
 \input texinfo @c -*- texinfo -*-
 @c %**start of header
 @setfilename qemu-doc.info
+@include version.texi
 
 @documentlanguage en
 @documentencoding UTF-8
 
-@settitle QEMU Emulator User Documentation
+@settitle QEMU version @value{VERSION} User Documentation
 @exampleindent 0
 @paragraphindent 0
 @c %**end of header
@@ -19,7 +20,7 @@
 @iftex
 @titlepage
 @sp 7
-@center @titlefont{QEMU Emulator}
+@center @titlefont{QEMU version @value{VERSION}}
 @sp 1
 @center @titlefont{User Documentation}
 @sp 3
-- 
1.8.3.1

  parent reply	other threads:[~2017-06-15 10:54 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-15 10:52 [Qemu-devel] [PULL 00/41] Misc patches for 2017-06-15 Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 01/41] exec: check kvm mmu notifiers earlier Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 02/41] exec: split file_ram_alloc() Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 03/41] exec: split qemu_ram_alloc_from_file() Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 04/41] Add memory_region_init_ram_from_fd() Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 05/41] ivshmem: use ram_from_fd() Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 06/41] memory: remove memory_region_set_fd Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 07/41] megasas: add qtest Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 08/41] megasas: do not read sense length more than once from frame Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 09/41] megasas: do not read iovec count " Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 10/41] megasas: do not read DCMD opcode " Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 11/41] megasas: do not read command " Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 12/41] megasas: do not read SCSI req parameters " Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 13/41] megasas: always store SCSIRequest* into MegasasCmd Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 14/41] Makefile: Do not generate files if "configure" has not been run yet Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 15/41] vl: Fix broken thread=xxx option of the --accel parameter Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 16/41] kvm-all: make async_safe_run_on_cpu safe on kvm too Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 17/41] hax-all: make async_safe_run_on_cpu safe on HAX too Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 18/41] nbd: Fix regression on resiliency to port scan Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 19/41] qemu-nbd: Ignore SIGPIPE Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 20/41] accel: split the tcg accelerator from accel.c file Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 21/41] tcg: move tcg related files into accel/tcg/ subdirectory Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 22/41] tcg: move tcg backend files into accel/tcg/ Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 23/41] accel: move kvm related accelerator files into accel/ Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 24/41] nbd: rename read_sync and friends Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 25/41] nbd: make nbd_drop public Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 26/41] nbd/server: get rid of nbd_negotiate_read and friends Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 27/41] nbd/server: get rid of ssize_t Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 28/41] nbd/server: refactor nbd_co_send_reply Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 29/41] nbd/server: get rid of EAGAIN dead code Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 30/41] nbd/server: refactor nbd_co_receive_request Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 31/41] nbd/server: remove NBDClientNewData Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 32/41] nbd/server: nbd_negotiate: fix error path Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 33/41] nbd/server: get rid of fail: return rc Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 34/41] nbd/server: rename rc to ret Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 35/41] nbd/server: refactor nbd_trip Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 36/41] include/exec/poison: Add missing TARGET defines Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 37/41] include/exec/poison: Mark some CONFIG defines as poisoned, too Paolo Bonzini
2017-06-15 10:52 ` [Qemu-devel] [PULL 38/41] docs: create interop/ subdirectory Paolo Bonzini
2017-06-15 10:52 ` Paolo Bonzini [this message]
2017-06-15 10:53 ` [Qemu-devel] [PULL 40/41] vhost-user-scsi: Introduce vhost-user-scsi host device Paolo Bonzini
2017-07-18 16:32   ` Marc-André Lureau
2017-07-23 14:47     ` Paolo Bonzini
2017-06-15 10:53 ` [Qemu-devel] [PULL 41/41] vhost-user-scsi: Introduce a vhost-user-scsi sample application Paolo Bonzini
2017-06-20 15:00 ` [Qemu-devel] [PULL 00/41] Misc patches for 2017-06-15 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1497523981-38449-40-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).