From nobody Fri May 3 01:06:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487358411851658.3455730486374; Fri, 17 Feb 2017 11:06:51 -0800 (PST) Received: from localhost ([::1]:55335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cenrm-0002zd-JW for importer@patchew.org; Fri, 17 Feb 2017 14:06:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cenks-0005wq-VW for qemu-devel@nongnu.org; Fri, 17 Feb 2017 13:59:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cenkr-00018T-9H for qemu-devel@nongnu.org; Fri, 17 Feb 2017 13:59:43 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:48560) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cenkr-00014v-1u for qemu-devel@nongnu.org; Fri, 17 Feb 2017 13:59:41 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1cenkh-0003oU-4e; Fri, 17 Feb 2017 18:59:31 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 17 Feb 2017 18:59:28 +0000 Message-Id: <1487357968-31000-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH v2] Makefile: Put VERSION info into version.texi rather than using -D X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Markus Armbruster , patches@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Unfortunately some older versions of makeinfo don't correctly handle the -D command line option and fail to set the variable. This then causes them to complain docs/qemu-ga-ref.texi:41: warning: undefined flag: VERSION Work around this by doing as the autotools do, and writing the information into a version.texi file which we then include from the .texi files that need it. Signed-off-by: Peter Maydell Reviewed-by: Eric Blake Reviewed-by: Marc-Andr=C3=A9 Lureau --- Changes v1->v2: add .gitignore entry --- Makefile | 17 ++++++++++------- .gitignore | 1 + docs/qemu-ga-ref.texi | 2 ++ docs/qemu-qmp-ref.texi | 2 ++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 830fa5a..1c4c04f 100644 --- a/Makefile +++ b/Makefile @@ -516,7 +516,7 @@ distclean: clean 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 + rm -f qemu-ga-qapi.texi qemu-qapi.texi version.texi rm -f docs/qemu-qmp-ref.7 docs/qemu-ga-ref.7 rm -f docs/qemu-qmp-ref.txt docs/qemu-ga-ref.txt rm -f docs/qemu-qmp-ref.pdf docs/qemu-ga-ref.pdf @@ -663,21 +663,24 @@ ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \ =20 # documentation MAKEINFO=3Dmakeinfo -MAKEINFOFLAGS=3D--no-split --number-sections -D 'VERSION $(VERSION)' -TEXIFLAG=3D$(if $(V),,--quiet) --command=3D'@set VERSION $(VERSION)' +MAKEINFOFLAGS=3D--no-split --number-sections +TEXIFLAG=3D$(if $(V),,--quiet) =20 -%.html: %.texi +version.texi: $(SRC_PATH)/VERSION + $(call quiet-command,echo "@set VERSION $(VERSION)" > $@,"GEN","$@") + +%.html: %.texi version.texi $(call quiet-command,LC_ALL=3DC $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers= \ --html $< -o $@,"GEN","$@") =20 -%.info: %.texi +%.info: %.texi version.texi $(call quiet-command,$(MAKEINFO) $(MAKEINFOFLAGS) $< -o $@,"GEN","$@") =20 -%.txt: %.texi +%.txt: %.texi version.texi $(call quiet-command,LC_ALL=3DC $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers= \ --plaintext $< -o $@,"GEN","$@") =20 -%.pdf: %.texi +%.pdf: %.texi version.texi $(call quiet-command,texi2pdf $(TEXIFLAG) -I $(SRC_PATH) -I . $< -o $@,"G= EN","$@") =20 qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool diff --git a/.gitignore b/.gitignore index c563dc1..2849d75 100644 --- a/.gitignore +++ b/.gitignore @@ -107,6 +107,7 @@ docs/qemu-ga-ref.info* docs/qemu-qmp-ref.info* /qemu-ga-qapi.texi /qemu-qapi.texi +/version.texi *.tps .stgit-* cscope.* diff --git a/docs/qemu-ga-ref.texi b/docs/qemu-ga-ref.texi index 87cc8d0..ddb76ce 100644 --- a/docs/qemu-ga-ref.texi +++ b/docs/qemu-ga-ref.texi @@ -1,6 +1,8 @@ \input texinfo @setfilename qemu-ga-ref.info =20 +@include version.texi + @exampleindent 0 @paragraphindent 0 =20 diff --git a/docs/qemu-qmp-ref.texi b/docs/qemu-qmp-ref.texi index 818e525..0a00569 100644 --- a/docs/qemu-qmp-ref.texi +++ b/docs/qemu-qmp-ref.texi @@ -1,6 +1,8 @@ \input texinfo @setfilename qemu-qmp-ref.info =20 +@include version.texi + @exampleindent 0 @paragraphindent 0 =20 --=20 2.7.4