[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/24] move block/ objects to nested Makefile
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 10/24] move block/ objects to nested Makefile |
Date: |
Sun, 3 Jun 2012 14:25:44 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile.objs | 16 ++--------------
block/Makefile | 11 +++++++++++
2 files changed, 13 insertions(+), 14 deletions(-)
create mode 100644 block/Makefile
diff --git a/Makefile.objs b/Makefile.objs
index d823968..7c8a997 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -45,20 +45,7 @@ block-obj-y += nbd.o block.o aio.o aes.o qemu-config.o
qemu-progress.o qemu-sock
block-obj-y += $(coroutine-obj-y) $(qobject-obj-y) $(version-obj-y)
block-obj-$(CONFIG_POSIX) += posix-aio-compat.o
block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o
-
-block-nested-y += raw.o cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o
vvfat.o
-block-nested-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o
qcow2-cache.o
-block-nested-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o
-block-nested-y += qed-check.o
-block-nested-y += parallels.o nbd.o blkdebug.o sheepdog.o blkverify.o
-block-nested-y += stream.o
-block-nested-$(CONFIG_WIN32) += raw-win32.o
-block-nested-$(CONFIG_POSIX) += raw-posix.o
-block-nested-$(CONFIG_LIBISCSI) += iscsi.o
-block-nested-$(CONFIG_CURL) += curl.o
-block-nested-$(CONFIG_RBD) += rbd.o
-
-block-obj-y += $(addprefix block/, $(block-nested-y))
+block-obj-y += block/
net-obj-y = net.o
net-nested-y = queue.o checksum.o util.o
@@ -467,6 +454,7 @@ vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS)
QEMU_CFLAGS+=$(GLIB_CFLAGS)
nested-vars += \
+ block-obj-y \
qom-obj-y \
user-obj-y \
common-obj-y
diff --git a/block/Makefile b/block/Makefile
new file mode 100644
index 0000000..b5754d3
--- /dev/null
+++ b/block/Makefile
@@ -0,0 +1,11 @@
+block-obj-y += raw.o cow.o qcow.o vdi.o vmdk.o cloop.o dmg.o bochs.o vpc.o
vvfat.o
+block-obj-y += qcow2.o qcow2-refcount.o qcow2-cluster.o qcow2-snapshot.o
qcow2-cache.o
+block-obj-y += qed.o qed-gencb.o qed-l2-cache.o qed-table.o qed-cluster.o
+block-obj-y += qed-check.o
+block-obj-y += parallels.o nbd.o blkdebug.o sheepdog.o blkverify.o
+block-obj-y += stream.o
+block-obj-$(CONFIG_WIN32) += raw-win32.o
+block-obj-$(CONFIG_POSIX) += raw-posix.o
+block-obj-$(CONFIG_LIBISCSI) += iscsi.o
+block-obj-$(CONFIG_CURL) += curl.o
+block-obj-$(CONFIG_RBD) += rbd.o
--
1.7.10.1
- [Qemu-devel] [PATCH 03/24] add rules for nesting, (continued)
- [Qemu-devel] [PATCH 03/24] add rules for nesting, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 02/24] do not sprinkle around GENERATED_HEADERS dependencies, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 04/24] move *-user/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 06/24] move libobj-y variable to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 05/24] move obj-TARGET-y variables to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 07/24] move other target-*/ objects to nested Makefiles, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 08/24] move rules for nesting to Makefile.objs, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 09/24] use nested Makefile rules for qom/ objects, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 10/24] move block/ objects to nested Makefile,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 12/24] move fsdev/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 11/24] move net/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 13/24] move ui/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 14/24] move audio/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 15/24] move slirp/ objects to nested Makefile, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 18/24] move target-independent hw/ objects to nested Makefiles, Paolo Bonzini, 2012/06/03
- [Qemu-devel] [PATCH 19/24] convert libhw to nested Makefiles, Paolo Bonzini, 2012/06/03