diff options
author | Avi Kivity <avi@redhat.com> | 2010-10-28 17:01:07 +0200 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-10-28 17:01:07 +0200 |
commit | 6983f3bba2cc820b882cf6071d7cf3bb113af47e (patch) | |
tree | 803b5c63b7a64ba1b2c53c8eb668d2b0ee390f83 /Makefile | |
parent | 185b93006873e14cb2e33720d5a0c7115972032a (diff) | |
parent | 174b2877b0f6a607f994f7a5b9b9a36caaff5d75 (diff) |
Merge branch 'master' of git://git.sv.gnu.org/qemu into next
* 'master' of git://git.sv.gnu.org/qemu: (26 commits)
seabios: Update to 0.6.1
qemu-timer: move commonly used timer code to qemu-timer-common
rewrite i386 tests Makefile
fix test_path
make runcom compile on recent distributions
disable test_enter on i386, it is broken
unbreak "make" from vpath-built tests directory
unbreak "make" from tests directory
mips_fulong2e: fix ram allocation
Replace remaining gcc format attributes by macro GCC_FMT_ATTR (format checking)
Remove special handling of system include files (no longer needed)
virtio-blk: Respect werror option for flushes
ide: Handle flush failure
ide: Factor ide_flush_cache out
qemu-img: Fix qemu-img convert -obacking_file
block: Use GCC_FMT_ATTR and fix a format error
qemu-io: New command map
Copy snapshots out of QCOW2 disk
ide: set WCACHE supported in IDENTIFY data
qcow2: Remove old image creation function
...
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -129,23 +129,23 @@ version-obj-$(CONFIG_WIN32) += version.o qemu-img.o: qemu-img-cmds.h qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o: $(GENERATED_HEADERS) -qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) +qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o -qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) +qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o -qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) +qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) qemu-timer-common.o qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $@") 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 |