[Qemu-devel] [PATCH] build-sys: Minor qapi doc generation target cleanups

[Qemu-devel] [PATCH] build-sys: Minor qapi doc generation target cleanups

[Markus Armbruster]

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 <marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9f8968d..f35c422 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","$@")
-- 
2.7.4

Re: [Qemu-devel] [PATCH] build-sys: Minor qapi doc generation target cleanups

[Marc-André Lureau]

On Thu, Jan 19, 2017 at 1:07 PM Markus Armbruster <armbru@redhat.com> wrote:

> 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 <marcandre.lureau@redhat.com>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>

Yes, I thought you touched that before the merge:
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>



> ---
>  Makefile | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 9f8968d..f35c422 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","$@")
> --
> 2.7.4
>
>
> --
Marc-André Lureau