[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/14] Rename BLOCK_OBJS to block-obj-y
From: |
quintela |
Subject: |
[Qemu-devel] [PATCH 04/14] Rename BLOCK_OBJS to block-obj-y |
Date: |
Thu, 25 Jun 2009 00:08:02 +0200 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Makefile b/Makefile
index a06c9bf..25a40a0 100644
--- a/Makefile
+++ b/Makefile
@@ -64,27 +64,27 @@ $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a
recurse-all: $(SUBDIR_RULES)
#######################################################################
-# BLOCK_OBJS is code used by both qemu system emulation and qemu-img
+# block-obj-y is code used by both qemu system emulation and qemu-img
-BLOCK_OBJS=cutils.o cache-utils.o qemu-malloc.o qemu-option.o module.o
-BLOCK_OBJS+=block/cow.o block/qcow.o aes.o block/vmdk.o block/cloop.o
-BLOCK_OBJS+=block/dmg.o block/bochs.o block/vpc.o block/vvfat.o
-BLOCK_OBJS+=block/qcow2.o block/qcow2-refcount.o block/qcow2-cluster.o
-BLOCK_OBJS+=block/qcow2-snapshot.o
-BLOCK_OBJS+=block/parallels.o block/nbd.o
-BLOCK_OBJS+=nbd.o block.o aio.o
+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
ifdef CONFIG_WIN32
-BLOCK_OBJS += block/raw-win32.o
+block-obj-y += block/raw-win32.o
else
ifdef CONFIG_AIO
-BLOCK_OBJS += posix-aio-compat.o
+block-obj-y += posix-aio-compat.o
endif
-BLOCK_OBJS += block/raw-posix.o
+block-obj-y += block/raw-posix.o
endif
ifdef CONFIG_CURL
-BLOCK_OBJS += block/curl.o
+block-obj-y += block/curl.o
endif
######################################################################
@@ -93,7 +93,7 @@ endif
# system emulation, i.e. a single QEMU executable should support all
# CPUs and machines.
-OBJS=$(BLOCK_OBJS)
+OBJS=$(block-obj-y)
OBJS+=readline.o console.o
OBJS+=irq.o ptimer.o
@@ -243,11 +243,11 @@ libqemu_user.a: $(USER_OBJS)
qemu-img.o: qemu-img-cmds.h
-qemu-img$(EXESUF): qemu-img.o qemu-tool.o tool-osdep.o $(BLOCK_OBJS)
+qemu-img$(EXESUF): qemu-img.o qemu-tool.o tool-osdep.o $(block-obj-y)
-qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o tool-osdep.o $(BLOCK_OBJS)
+qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o tool-osdep.o $(block-obj-y)
-qemu-io$(EXESUF): qemu-io.o qemu-tool.o tool-osdep.o cmd.o $(BLOCK_OBJS)
+qemu-io$(EXESUF): qemu-io.o qemu-tool.o tool-osdep.o cmd.o $(block-obj-y)
qemu-img$(EXESUF) qemu-nbd$(EXESUF) qemu-io$(EXESUF): LIBS += -lz
--
1.6.2.2
- [Qemu-devel] [PATCH 00/14] Refactor Makefile object selection, quintela, 2009/06/24
- [Qemu-devel] [PATCH 01/14] Rename OBJS to obj-y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 02/14] Rename LIBOBJS to libobj-y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 03/14] Rename OBJS to obj-y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 04/14] Rename BLOCK_OBJS to block-obj-y,
quintela <=
- [Qemu-devel] [PATCH 05/14] Rename AUDIO_OBJS to audio-obj-y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 06/14] Rename SLIRP_OBJS to slirp-obj-y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 07/14] Rename XEN_OBJS to xen-obj-y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 08/14] Rename USER_OBJS to user-obj-y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 09/14] Rename OBJS to obj-y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 11/14] Substitute ifdef CONFIG_FOO by obj-, quintela, 2009/06/24
- [Qemu-devel] [PATCH 10/14] move CONFIG_* values from yes to y, quintela, 2009/06/24
- [Qemu-devel] [PATCH 12/14] Substitute ifdef CONFIG_FOO by obj-, quintela, 2009/06/24