Revision 69758c22

b/Makefile
164 164
	iohandler.o cutils.o iov.o async.o
165 165
tools-obj-$(CONFIG_POSIX) += compatfd.o
166 166

  
167
qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y) $(qapi-obj-y) \
168
                              qapi-visit.o qapi-types.o
167
qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y)
169 168
qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y)
170 169
qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y)
171 170

  
b/Makefile.objs
48 48
block-obj-$(CONFIG_POSIX) += posix-aio-compat.o
49 49
block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
50 50
block-obj-y += block/
51
block-obj-y += $(qapi-obj-y) qapi-types.o qapi-visit.o
51 52

  
52 53
ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
53 54
# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
......
239 240

  
240 241
nested-vars += \
241 242
	qga-obj-y \
242
	block-obj-y \
243 243
	qom-obj-y \
244 244
	qapi-obj-y \
245
	block-obj-y \
245 246
	user-obj-y \
246 247
	common-obj-y \
247 248
	extra-obj-y

Also available in: Unified diff