aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2010-10-26 09:51:03 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2010-10-26 09:51:03 -0500
commit174b2877b0f6a607f994f7a5b9b9a36caaff5d75 (patch)
tree94b2f8a757b865a0ec0a3e43b8a223f095cf6869 /Makefile
parentMerge remote branch 'kwolf/for-anthony' into staging (diff)
parentmonitor: Ignore "." and ".." when completing file name. (diff)
downloadqemu-kvm-174b2877b0f6a607f994f7a5b9b9a36caaff5d75.tar.gz
qemu-kvm-174b2877b0f6a607f994f7a5b9b9a36caaff5d75.tar.bz2
qemu-kvm-174b2877b0f6a607f994f7a5b9b9a36caaff5d75.zip
Merge remote branch 'qmp/for-anthony' into staging
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index a1434b1bd..3df202c26 100644
--- a/Makefile
+++ b/Makefile
@@ -140,12 +140,12 @@ 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
-check-qstring: check-qstring.o qstring.o qemu-malloc.o
-check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qemu-malloc.o qlist.o
-check-qlist: check-qlist.o qlist.o qint.o qemu-malloc.o
-check-qfloat: check-qfloat.o qfloat.o qemu-malloc.o
-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
+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)
clean:
# avoid old build problems by removing potentially incorrect old files