Commit 1a65ba760532b55175f7a51bed7940c9ed42845b

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent 727374d9

use block-nested-y for files inside block/

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Showing 1 changed file with 11 additions and 9 deletions
Makefile
@@ -67,23 +67,25 @@ recurse-all: $(SUBDIR_RULES) @@ -67,23 +67,25 @@ recurse-all: $(SUBDIR_RULES)
67 # block-obj-y is code used by both qemu system emulation and qemu-img 67 # block-obj-y is code used by both qemu system emulation and qemu-img
68 68
69 block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o 69 block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o
70 -block-obj-y += block/cow.o block/qcow.o aes.o block/vmdk.o block/cloop.o  
71 -block-obj-y += block/dmg.o block/bochs.o block/vpc.o block/vvfat.o  
72 -block-obj-y += block/qcow2.o block/qcow2-refcount.o block/qcow2-cluster.o  
73 -block-obj-y += block/qcow2-snapshot.o  
74 -block-obj-y += block/parallels.o block/nbd.o  
75 -block-obj-y += nbd.o block.o aio.o 70 +block-obj-y += nbd.o block.o aio.o aes.o
  71 +
  72 +block-nested-y += cow.o qcow.o vmdk.o cloop.o dmg.o bochs.o vpc.o vvfat.o
  73 +block-nested-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o
  74 +block-nested-y += parallels.o nbd.o
  75 +
76 76
77 ifdef CONFIG_WIN32 77 ifdef CONFIG_WIN32
78 -block-obj-y += block/raw-win32.o 78 +block-nested-y += raw-win32.o
79 else 79 else
80 ifdef CONFIG_AIO 80 ifdef CONFIG_AIO
81 block-obj-y += posix-aio-compat.o 81 block-obj-y += posix-aio-compat.o
82 endif 82 endif
83 -block-obj-y += block/raw-posix.o 83 +block-nested-y += raw-posix.o
84 endif 84 endif
85 85
86 -block-obj-$(CONFIG_CURL) += block/curl.o 86 +block-nested-$(CONFIG_CURL) += curl.o
  87 +
  88 +block-obj-y += $(addprefix block/, $(block-nested-y))
87 89
88 ###################################################################### 90 ######################################################################
89 # libqemu_common.a: Target independent part of system emulation. The 91 # libqemu_common.a: Target independent part of system emulation. The