From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=43743 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIhoE-0003Cl-8d for qemu-devel@nongnu.org; Wed, 17 Nov 2010 08:12:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PIhoC-0003aF-Ie for qemu-devel@nongnu.org; Wed, 17 Nov 2010 08:12:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:29551) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PIhoC-0003Zs-AL for qemu-devel@nongnu.org; Wed, 17 Nov 2010 08:12:20 -0500 From: Luiz Capitulino Date: Wed, 17 Nov 2010 11:12:02 -0200 Message-Id: <1289999522-11333-8-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1289999522-11333-1-git-send-email-lcapitulino@redhat.com> References: <1289999522-11333-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 7/7] Makefile: Fix check dependency breakage List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: aliguori@us.ibm.com Cc: qemu-devel@nongnu.org Commit b152aa84d52882bb1846485a89baf13aa07c86bc broke the unit-tests build, fix it. Signed-off-by: Luiz Capitulino --- Makefile | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 747e47c..4e120a2 100644 --- a/Makefile +++ b/Makefile @@ -163,12 +163,14 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o: $(GENERATED_HEADERS) -check-qint: check-qint.o qint.o qemu-malloc.o $(trace-obj-y) -check-qstring: check-qstring.o qstring.o qemu-malloc.o $(trace-obj-y) -check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.o $(trace-obj-y) -check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o $(trace-obj-y) -check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o $(trace-obj-y) -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 qemu-malloc.o $(trace-obj-y) +CHECK_PROG_DEPS = qemu-malloc.o $(oslib-obj-y) $(trace-obj-y) + +check-qint: check-qint.o qint.o $(CHECK_PROG_DEPS) +check-qstring: check-qstring.o qstring.o $(CHECK_PROG_DEPS) +check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qlist.o $(CHECK_PROG_DEPS) +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 $(CHECK_PROG_DEPS) clean: # avoid old build problems by removing potentially incorrect old files -- 1.7.3.2.168.gd6b63