From e8518c92b0b143cfeb4251d3185f262c2d2b6ee9 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 19 Jan 2017 10:06:44 +0100 Subject: [PATCH] build-sys: Minor qapi doc generation target cleanups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move makeinfo flags from MAKEINFO to MAKEINFOFLAGS. Fix the call of quiet-command for target qemu-ga-qapi.texi. Both messed up in commit 56e8bdd. Cc: Marc-André Lureau Signed-off-by: Markus Armbruster Message-Id: <1484816804-12598-1-git-send-email-armbru@redhat.com> Reviewed-by: Marc-André Lureau --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c166d2d3ea..1e5cb1934d 100644 --- a/Makefile +++ b/Makefile @@ -542,8 +542,8 @@ ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \ ui/shader/texture-blit-vert.h ui/shader/texture-blit-frag.h # documentation -MAKEINFO=makeinfo -D 'VERSION $(VERSION)' -MAKEINFOFLAGS=--no-split --number-sections +MAKEINFO=makeinfo +MAKEINFOFLAGS=--no-split --number-sections -D 'VERSION $(VERSION)' TEXIFLAG=$(if $(V),,--quiet) --command='@set VERSION $(VERSION)' %.html: %.texi @@ -573,7 +573,7 @@ qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@") qemu-qapi.texi: $(qapi-modules) $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< > $@,"GEN" "$@") + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< > $@,"GEN","$@") qemu-ga-qapi.texi: $(SRC_PATH)/qga/qapi-schema.json $(qapi-py) $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< > $@,"GEN","$@")