From patchwork Fri Jun 3 22:33:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 98680 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3CFF5B6F7B for ; Sat, 4 Jun 2011 09:26:42 +1000 (EST) Received: from localhost ([::1]:32857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QSdlH-0000qT-0r for incoming@patchwork.ozlabs.org; Fri, 03 Jun 2011 19:26:39 -0400 Received: from eggs.gnu.org ([140.186.70.92]:46776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QScya-0005nU-My for qemu-devel@nongnu.org; Fri, 03 Jun 2011 18:36:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QScyX-00024g-EW for qemu-devel@nongnu.org; Fri, 03 Jun 2011 18:36:20 -0400 Received: from mout.perfora.net ([74.208.4.195]:61995) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QScyW-00023U-Th for qemu-devel@nongnu.org; Fri, 03 Jun 2011 18:36:17 -0400 Received: from localhost.localdomain ([32.97.110.59]) by mrelay.perfora.net (node=mrus1) with ESMTP (Nemesis) id 0LxQZ8-1PVqKE0BJq-0178JQ; Fri, 03 Jun 2011 18:36:11 -0400 From: Michael Roth To: qemu-devel@nongnu.org Date: Fri, 3 Jun 2011 17:33:16 -0500 Message-Id: <1307140399-9023-19-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1307140399-9023-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1307140399-9023-1-git-send-email-mdroth@linux.vnet.ibm.com> X-Provags-ID: V02:K0:+40UP4P6Asqpm26z4+RHBAHrS5tAvTyP2ah3Ia1k9DF CmSAUEnuorbDc1REQPNkcCCNdgY/lfJhpvj3+Ow717BWj/KInV zeeQ4CwbFGzlFblKH+HuRdAFPYkOQTpajfwhdYKDRjFdGZdJ9a XKkQYvr1iqQ0y8kpOQEqQogEW1eTmeANChRmMW6svVTuudHFd+ jJnvy7Bk9awRGgu3MUWXprPoDZ8uQuZNsLiq1n3Ovw= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.208.4.195 Cc: aliguori@linux.vnet.ibm.com, Jes.Sorensen@redhat.com, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v2][ 18/21] qapi: Makefile changes to build test-visiter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Michael Roth --- Makefile | 14 ++++++++++++++ Makefile.objs | 7 +++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index cf318c8..7176176 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-visiter.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-visiter.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h) +test-visiter: test-visiter.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: @@ -157,6 +170,7 @@ clean: 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; \ diff --git a/Makefile.objs b/Makefile.objs index eb264d9..9b77d10 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -362,6 +362,13 @@ endif libcacard-y = cac.o event.o vcard.o vreader.o vcard_emul_nss.o vcard_emul_type.o card_7816.o +###################################################################### +# qapi + +qapi-nested-y = qmp-input-visiter.o qmp-output-visiter.o qapi-dealloc-visiter.o +qapi-nested-y += qmp-registry.o qmp-dispatch.o +qapi-obj-y = $(addprefix qapi/, $(qapi-nested-y)) + vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)