Revision 019d6b8f Makefile

b/Makefile
64 64
# BLOCK_OBJS is code used by both qemu system emulation and qemu-img
65 65

  
66 66
BLOCK_OBJS=cutils.o cache-utils.o qemu-malloc.o module.o
67
BLOCK_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o
68
BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o
69
BLOCK_OBJS+=block-qcow2.o block-parallels.o block-nbd.o
67
BLOCK_OBJS+=block/cow.o block/qcow.o aes.o block/vmdk.o block/cloop.o
68
BLOCK_OBJS+=block/dmg.o block/bochs.o block/vpc.o block/vvfat.o
69
BLOCK_OBJS+=block/qcow2.o block/parallels.o block/nbd.o
70 70
BLOCK_OBJS+=nbd.o block.o aio.o
71 71

  
72 72
ifdef CONFIG_WIN32
73
BLOCK_OBJS += block-raw-win32.o
73
BLOCK_OBJS += block/raw-win32.o
74 74
else
75 75
ifdef CONFIG_AIO
76 76
BLOCK_OBJS += posix-aio-compat.o
77 77
endif
78
BLOCK_OBJS += block-raw-posix.o
78
BLOCK_OBJS += block/raw-posix.o
79 79
endif
80 80

  
81 81
######################################################################
......
234 234
# avoid old build problems by removing potentially incorrect old files
235 235
	rm -f config.mak config.h op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
236 236
	rm -f *.o *.d *.a $(TOOLS) TAGS cscope.* *.pod *~ */*~
237
	rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d
237
	rm -f slirp/*.o slirp/*.d audio/*.o audio/*.d block/*.o block/*.d
238 238
	$(MAKE) -C tests clean
239 239
	for d in $(TARGET_DIRS); do \
240 240
	$(MAKE) -C $$d $@ || exit 1 ; \
......
408 408
	$(mandir)/man8/qemu-nbd.8
409 409

  
410 410
# Include automatically generated dependency files
411
-include $(wildcard *.d audio/*.d slirp/*.d)
411
-include $(wildcard *.d audio/*.d slirp/*.d block/*.d)

Also available in: Unified diff