* [Qemu-devel] [PATCH] build-sys: Minor qapi doc generation target cleanups
@ 2017-01-19 9:06 Markus Armbruster
2017-01-19 9:10 ` Marc-André Lureau
0 siblings, 1 reply; 2+ messages in thread
From: Markus Armbruster @ 2017-01-19 9:06 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] build-sys: Minor qapi doc generation target cleanups
2017-01-19 9:06 [Qemu-devel] [PATCH] build-sys: Minor qapi doc generation target cleanups Markus Armbruster
@ 2017-01-19 9:10 ` Marc-André Lureau
0 siblings, 0 replies; 2+ messages in thread
From: Marc-André Lureau @ 2017-01-19 9:10 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-19 9:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-19 9:06 [Qemu-devel] [PATCH] build-sys: Minor qapi doc generation target cleanups Markus Armbruster
2017-01-19 9:10 ` Marc-André Lureau
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.