[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 18/21] qapi: Makefile changes to build test-v
From: |
Luiz Capitulino |
Subject: |
Re: [Qemu-devel] [PATCH v3 18/21] qapi: Makefile changes to build test-visitor |
Date: |
Wed, 15 Jun 2011 16:35:19 -0300 |
On Mon, 13 Jun 2011 21:31:23 -0500
Michael Roth <address@hidden> wrote:
>
> Signed-off-by: Michael Roth <address@hidden>
> ---
> Makefile | 16 +++++++++++++++-
> 1 files changed, 15 insertions(+), 1 deletions(-)
This should be merged with the patch adding the test-visitor code.
>
> diff --git a/Makefile b/Makefile
> index 306cd9b..6083085 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -145,6 +145,19 @@ check-qlist: check-qlist.o qlist.o qint.o
> $(CHECK_PROG_DEPS)
> 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-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
> + $(call quiet-command,python $(SRC_PATH)/scripts/qapi-types.py -o
> "$(qapi-dir)" -p "test-" < $<, " GEN $@")
> +$(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 $@")
> +
> +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
> +
> QEMULIBS=libhw32 libhw64 libuser libdis libdis-user
>
> clean:
> @@ -152,11 +165,12 @@ clean:
> rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h
> gen-op-arm.h
> rm -f qemu-options.def
> rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~
> - rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d
> net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d
> + rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d
> net/*.o net/*.d fsdev/*.o fsdev/*.d ui/*.o ui/*.d qapi/*.o qapi/*.d
> rm -f qemu-img-cmds.h
> rm -f trace.c trace.h trace.c-timestamp trace.h-timestamp
> rm -f trace-dtrace.dtrace trace-dtrace.dtrace-timestamp
> rm -f trace-dtrace.h trace-dtrace.h-timestamp
> + rm -rf $(qapi-dir)
> $(MAKE) -C tests clean
> for d in $(ALL_SUBDIRS) $(QEMULIBS) libcacard; do \
> if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
- [Qemu-devel] [PATCH v3 10/21] qapi: add ordereddict.py helper library, (continued)
- [Qemu-devel] [PATCH v3 10/21] qapi: add ordereddict.py helper library, Michael Roth, 2011/06/13
- [Qemu-devel] [PATCH v3 12/21] qapi: add qapi-types.py code generator, Michael Roth, 2011/06/13
- [Qemu-devel] [PATCH v3 13/21] qapi: add qapi-visit.py code generator, Michael Roth, 2011/06/13
- [Qemu-devel] [PATCH v3 14/21] qapi: add qapi-commands.py code generator, Michael Roth, 2011/06/13
- [Qemu-devel] [PATCH v3 15/21] qapi: test schema used for unit tests, Michael Roth, 2011/06/13
- [Qemu-devel] [PATCH v3 16/21] qapi: add test-visitor, tests for gen. visitor code, Michael Roth, 2011/06/13
- [Qemu-devel] [PATCH v3 17/21] qapi: configure, Fix build issue when using seperate build dir, Michael Roth, 2011/06/13
- [Qemu-devel] [PATCH v3 18/21] qapi: Makefile changes to build test-visitor, Michael Roth, 2011/06/13
- Re: [Qemu-devel] [PATCH v3 18/21] qapi: Makefile changes to build test-visitor,
Luiz Capitulino <=
- [Qemu-devel] [PATCH v3 19/21] qapi: add test-qmp-commands, tests for gen. marshalling/dispatch code, Michael Roth, 2011/06/13
- [Qemu-devel] [PATCH v3 21/21] qapi: add QAPI code generation documentation, Michael Roth, 2011/06/13
- [Qemu-devel] [PATCH v3 20/21] qapi: Makefile changes to build test-qmp-commands, Michael Roth, 2011/06/13