[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/11] build: move cutils.o and qemu-timer-common.o
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 02/11] build: move cutils.o and qemu-timer-common.o to oslib-obj-y |
Date: |
Mon, 29 Oct 2012 19:07:09 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile | 3 +--
Makefile.objs | 6 +++---
2 file modificati, 4 inserzioni(+), 5 rimozioni(-)
diff --git a/Makefile b/Makefile
index 843e825..e489583 100644
--- a/Makefile
+++ b/Makefile
@@ -171,8 +171,7 @@ endif
qemu-img.o: qemu-img-cmds.h
tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-tool.o qemu-timer.o \
- qemu-timer-common.o main-loop.o notify.o \
- iohandler.o cutils.o async.o error.o
+ main-loop.o notify.o iohandler.o async.o error.o
tools-obj-$(CONFIG_POSIX) += compatfd.o
qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y)
diff --git a/Makefile.objs b/Makefile.objs
index 99a268e..9e36166 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -19,7 +19,7 @@ universal-obj-y += $(qom-obj-y)
#######################################################################
# oslib-obj-y is code depending on the OS (win32 vs posix)
-oslib-obj-y = osdep.o
+oslib-obj-y = osdep.o cutils.o qemu-timer-common.o
oslib-obj-$(CONFIG_WIN32) += oslib-win32.o qemu-thread-win32.o
oslib-obj-$(CONFIG_POSIX) += oslib-posix.o qemu-thread-posix.o
@@ -41,7 +41,7 @@ coroutine-obj-$(CONFIG_WIN32) += coroutine-win32.o
#######################################################################
# block-obj-y is code used by both qemu system emulation and qemu-img
-block-obj-y = cutils.o iov.o cache-utils.o qemu-option.o module.o async.o
+block-obj-y = iov.o cache-utils.o qemu-option.o module.o async.o
block-obj-y += nbd.o block.o blockjob.o aio.o aes.o qemu-config.o
block-obj-y += qemu-progress.o qemu-sockets.o uri.o notify.o
block-obj-y += $(coroutine-obj-y) $(qobject-obj-y) $(version-obj-y)
@@ -113,7 +113,7 @@ endif
user-obj-y =
user-obj-y += envlist.o path.o
user-obj-y += tcg-runtime.o host-utils.o
-user-obj-y += cutils.o cache-utils.o
+user-obj-y += cache-utils.o
user-obj-y += module.o
user-obj-y += qemu-user.o
user-obj-y += $(trace-obj-y)
--
1.7.12.1
- [Qemu-devel] [PATCH 00/11] Trim dependencies of qemu-ga, vscclient, tests, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 01/11] janitor: move iovector functions out of cutils.c, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 03/11] compiler: use weak aliases to provide default definitions, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 02/11] build: move cutils.o and qemu-timer-common.o to oslib-obj-y,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 04/11] sockets: use weak aliases instead of qemu-tool.c, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 05/11] fdsets: use weak aliases instead of qemu-tool.c/qemu-user.c, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 06/11] iohandler: add weak alias in qemu-sockets.c, for qemu-ga, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 07/11] win32: add weak version of qemu_fd_register, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 08/11] qemu-timer: make initialization functions idempotent, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 09/11] main-loop: unify qemu_init_main_loop between QEMU and tools, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 10/11] qemu-tool: do not depend on qemu-timer.c, Paolo Bonzini, 2012/10/29
- [Qemu-devel] [PATCH 11/11] build: do not include main loop where it is not actually used, Paolo Bonzini, 2012/10/29