* [Qemu-devel] [PATCH] Makefile: Fix check dependency breakage
@ 2010-11-12 14:55 Luiz Capitulino
2010-11-12 15:07 ` Markus Armbruster
2010-11-21 15:23 ` Anthony Liguori
0 siblings, 2 replies; 3+ messages in thread
From: Luiz Capitulino @ 2010-11-12 14:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Markus Armbruster
Commit b152aa84d52882bb1846485a89baf13aa07c86bc broke the unit-tests
build, fix it.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
Makefile | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 02698e9..719aca9 100644
--- a/Makefile
+++ b/Makefile
@@ -142,12 +142,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.164.g6f10c
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] Makefile: Fix check dependency breakage
2010-11-12 14:55 [Qemu-devel] [PATCH] Makefile: Fix check dependency breakage Luiz Capitulino
@ 2010-11-12 15:07 ` Markus Armbruster
2010-11-21 15:23 ` Anthony Liguori
1 sibling, 0 replies; 3+ messages in thread
From: Markus Armbruster @ 2010-11-12 15:07 UTC (permalink / raw)
To: Luiz Capitulino; +Cc: qemu-devel
Luiz Capitulino <lcapitulino@redhat.com> writes:
> Commit b152aa84d52882bb1846485a89baf13aa07c86bc broke the unit-tests
> build, fix it.
Got bitten by that, and the patch fixes it for me.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] Makefile: Fix check dependency breakage
2010-11-12 14:55 [Qemu-devel] [PATCH] Makefile: Fix check dependency breakage Luiz Capitulino
2010-11-12 15:07 ` Markus Armbruster
@ 2010-11-21 15:23 ` Anthony Liguori
1 sibling, 0 replies; 3+ messages in thread
From: Anthony Liguori @ 2010-11-21 15:23 UTC (permalink / raw)
To: Luiz Capitulino; +Cc: qemu-devel, Markus Armbruster
On 11/12/2010 08:55 AM, Luiz Capitulino wrote:
> Commit b152aa84d52882bb1846485a89baf13aa07c86bc broke the unit-tests
> build, fix it.
>
> Signed-off-by: Luiz Capitulino<lcapitulino@redhat.com>
>
Applied. Thanks.
Regards,
Anthony Liguori
> ---
> Makefile | 14 ++++++++------
> 1 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 02698e9..719aca9 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -142,12 +142,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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-11-21 15:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-12 14:55 [Qemu-devel] [PATCH] Makefile: Fix check dependency breakage Luiz Capitulino
2010-11-12 15:07 ` Markus Armbruster
2010-11-21 15:23 ` Anthony Liguori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).