Re: [Qemu-devel] [PATCH v3 20/21] qapi: Makefile changes to build test-qmp-commands

[Luiz Capitulino]

On Mon, 13 Jun 2011 21:31:25 -0500
Michael Roth <address@hidden> wrote:

> 
> Signed-off-by: Michael Roth <address@hidden>
> ---
>  Makefile |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)

Should be merged with the previous patch.

> 
> diff --git a/Makefile b/Makefile
> index 6083085..6adf1a9 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -146,7 +146,7 @@ check-qfloat: check-qfloat.o qfloat.o $(CHECK_PROG_DEPS)
>  check-qjson: check-qjson.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o 
> qjson.o json-streamer.o json-lexer.o json-parser.o error.o qerror.o 
> qemu-error.o $(CHECK_PROG_DEPS)
>  
>  qapi-dir := qapi-generated
> -$(qapi-obj-y) test-visitor.o: QEMU_CFLAGS += -I $(qapi-dir)
> +$(qapi-obj-y) test-visitor.o test-qmp-commands.o: QEMU_CFLAGS += -I 
> $(qapi-dir)
>  
>  $(qapi-dir)/test-qapi-types.c: $(qapi-dir)/test-qapi-types.h
>  $(qapi-dir)/test-qapi-types.h: $(SRC_PATH)/qapi-schema-test.json 
> $(SRC_PATH)/scripts/qapi-types.py
> @@ -154,10 +154,16 @@ $(qapi-dir)/test-qapi-types.h: 
> $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scr
>  $(qapi-dir)/test-qapi-visit.c: $(qapi-dir)/test-qapi-visit.h
>  $(qapi-dir)/test-qapi-visit.h: $(SRC_PATH)/qapi-schema-test.json 
> $(SRC_PATH)/scripts/qapi-visit.py
>       $(call quiet-command,python $(SRC_PATH)/scripts/qapi-visit.py -o 
> "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")
> +$(qapi-dir)/test-qmp-commands.h: $(qapi-dir)/test-qmp-marshal.c
> +$(qapi-dir)/test-qmp-marshal.c: $(SRC_PATH)/qapi-schema-test.json 
> $(SRC_PATH)/scripts/qapi-commands.py
> +         $(call quiet-command,python $(SRC_PATH)/scripts/qapi-commands.py -o 
> "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")
>  
>  test-visitor.o: $(addprefix $(qapi-dir)/, test-qapi-types.c 
> test-qapi-types.h test-qapi-visit.c test-qapi-visit.h)
>  test-visitor: test-visitor.o qfloat.o qint.o qdict.o qstring.o qlist.o 
> qbool.o $(qapi-obj-y) error.o osdep.o qemu-malloc.o $(oslib-obj-y) qjson.o 
> json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o 
> $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o
>  
> +test-qmp-commands.o: $(addprefix $(qapi-dir)/, test-qapi-types.c 
> test-qapi-types.h test-qapi-visit.c test-qapi-visit.h test-qmp-marshal.c 
> test-qmp-commands.h)
> +test-qmp-commands: test-qmp-commands.o qfloat.o qint.o qdict.o qstring.o 
> qlist.o qbool.o $(qapi-obj-y) error.o osdep.o qemu-malloc.o $(oslib-obj-y) 
> qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o 
> qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o 
> $(qapi-dir)/test-qmp-marshal.o module.o
> +
>  QEMULIBS=libhw32 libhw64 libuser libdis libdis-user
>  
>  clean: