[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/19] use block-nested-y for files inside block/
From: |
quintela |
Subject: |
[Qemu-devel] [PATCH 04/19] use block-nested-y for files inside block/ |
Date: |
Thu, 2 Jul 2009 16:46:28 +0200 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 66c28e5..99279c3 100644
--- a/Makefile
+++ b/Makefile
@@ -67,23 +67,25 @@ recurse-all: $(SUBDIR_RULES)
# block-obj-y is code used by both qemu system emulation and qemu-img
block-obj-y = cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o
-block-obj-y += block/cow.o block/qcow.o aes.o block/vmdk.o block/cloop.o
-block-obj-y += block/dmg.o block/bochs.o block/vpc.o block/vvfat.o
-block-obj-y += block/qcow2.o block/qcow2-refcount.o block/qcow2-cluster.o
-block-obj-y += block/qcow2-snapshot.o
-block-obj-y += block/parallels.o block/nbd.o
-block-obj-y += nbd.o block.o aio.o
+block-obj-y += nbd.o block.o aio.o aes.o
+
+block-nested-y += cow.o qcow.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
+block-nested-y += parallels.o nbd.o
+
ifdef CONFIG_WIN32
-block-obj-y += block/raw-win32.o
+block-nested-y += raw-win32.o
else
ifdef CONFIG_AIO
block-obj-y += posix-aio-compat.o
endif
-block-obj-y += block/raw-posix.o
+block-nested-y += raw-posix.o
endif
-block-obj-$(CONFIG_CURL) += block/curl.o
+block-nested-$(CONFIG_CURL) += curl.o
+
+block-obj-y += $(addprefix block/, $(block-nested-y))
######################################################################
# libqemu_common.a: Target independent part of system emulation. The
--
1.6.2.2
- [Qemu-devel] [PATCH 00/19] More Build System cleanups (v2), quintela, 2009/07/02
- [Qemu-devel] [PATCH 01/19] fix XEN Build, quintela, 2009/07/02
- [Qemu-devel] [PATCH 02/19] fix sparc not solaris build, quintela, 2009/07/02
- [Qemu-devel] [PATCH 03/19] Remove duplicated definition, quintela, 2009/07/02
- [Qemu-devel] [PATCH 05/19] use nwfpe-obj-y for consistence, quintela, 2009/07/02
- [Qemu-devel] [PATCH 04/19] use block-nested-y for files inside block/,
quintela <=
- [Qemu-devel] [PATCH 07/19] already defined several lines before in block-obj-y, quintela, 2009/07/02
- [Qemu-devel] [PATCH 08/19] configure already knows what TARGET_BASE_ARCH we need, no need to put the logic in Makefile.target, quintela, 2009/07/02
- [Qemu-devel] [PATCH 09/19] TARGET_ARCH2 is already known at configure time and it is called target_cpu Remove re-construction in Makefile.target, quintela, 2009/07/02
- [Qemu-devel] [PATCH 12/19] configure kvm in a single place, quintela, 2009/07/02
- [Qemu-devel] [PATCH 06/19] Remove unused Makefile variable, quintela, 2009/07/02
- [Qemu-devel] [PATCH 10/19] chang ifdefs by obj-, quintela, 2009/07/02
- [Qemu-devel] [PATCH 11/19] configure xen in a single place, quintela, 2009/07/02