Re: [Qemu-devel] [PATCH for-2.9 1/6] qapi: Drop excessive Make dependencies on qapi2texi.py

[Marc-André Lureau]

----- Original Message -----
> When qapi2texi.py changes, we regenerate everything QAPI.  Screwed up
> in commit 56e8bdd.
> 
> Signed-off-by: Markus Armbruster <address@hidden>

Reviewed-by: Marc-André Lureau <address@hidden>

> ---
>  Makefile | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 73e0c12..14d3e55 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -391,7 +391,6 @@ qemu-ga$(EXESUF): QEMU_CFLAGS += -I qga/qapi-generated
>  gen-out-type = $(subst .,-,$(suffix $@))
>  
>  qapi-py = $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py
> -qapi-py += $(SRC_PATH)/scripts/qapi2texi.py
>  
>  qga/qapi-generated/qga-qapi-types.c qga/qapi-generated/qga-qapi-types.h :\
>  $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py
>  $(qapi-py)
> @@ -700,10 +699,12 @@ qemu-monitor-info.texi:
> $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxt
>  qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
>       $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > 
> $@,"GEN","$@")
>  
> -docs/qemu-qmp-qapi.texi: $(qapi-modules) $(qapi-py)
> +docs/qemu-qmp-qapi.texi docs/qemu-ga-qapi.texi:
> $(SRC_PATH)/scripts/qapi2texi.py $(qapi-py)
> +
> +docs/qemu-qmp-qapi.texi: $(qapi-modules)
>       $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< >
>       $@,"GEN","$@")
>  
> -docs/qemu-ga-qapi.texi: $(SRC_PATH)/qga/qapi-schema.json $(qapi-py)
> +docs/qemu-ga-qapi.texi: $(SRC_PATH)/qga/qapi-schema.json
>       $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< >
>       $@,"GEN","$@")
>  
>  qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi
>  qemu-monitor-info.texi
> --
> 2.7.4
> 
>