Patchwork Makefile: Fix check dependency breakage

login
register
mail settings
Submitter Luiz Capitulino
Date Nov. 12, 2010, 2:55 p.m.
Message ID <20101112125546.6d2202b4@doriath>
Download mbox | patch
Permalink /patch/70975/
State New
Headers show

Comments

Luiz Capitulino - Nov. 12, 2010, 2:55 p.m.
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(-)
Markus Armbruster - Nov. 12, 2010, 3:07 p.m.
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.
Anthony Liguori - Nov. 21, 2010, 3:23 p.m.
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
>

Patch

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