[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/2] build: create shared-obj-y for tools/qemu-softm
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 2/2] build: create shared-obj-y for tools/qemu-softmmu |
Date: |
Thu, 24 Feb 2011 11:33:08 +0100 |
There are objects that need to be in both places, just make it explicit
in a single place.
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile | 4 +---
Makefile.objs | 14 +++++++++-----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 9e090cb..1902f96 100644
--- a/Makefile
+++ b/Makefile
@@ -150,9 +150,7 @@ version.o: $(SRC_PATH)/version.rc config-host.mak
version-obj-$(CONFIG_WIN32) += version.o
######################################################################
-tools-obj-y=qemu-tool.o qemu-error.o $(oslib-obj-y) $(trace-obj-y)
-tools-obj-y+=$(block-obj-y) $(qobject-obj-y) $(version-obj-y)
-tools-obj-y+=qemu-timer-common.o
+tools-obj-y = qemu-tool.o $(shared-obj-y) $(trace-obj-y) $(version-obj-y)
qemu-img.o: qemu-img-cmds.h
qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o cmd.o: $(GENERATED_HEADERS)
diff --git a/Makefile.objs b/Makefile.objs
index 9e98a66..5849487 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -54,17 +54,21 @@ fsdev-nested-$(CONFIG_VIRTFS) = qemu-fsdev.o
fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y))
######################################################################
+# shared-obj-y has the object that are shared by qemu binary and tools
+
+shared-obj-y = qemu-error.o $(block-obj-y) $(qobject-obj-y) $(oslib-obj-y)
+shared-obj-y += qemu-timer-common.o
+
+######################################################################
# libqemu_common.a: Target independent part of system emulation. The
# long term path is to suppress *all* target specific code in case of
# system emulation, i.e. a single QEMU executable should support all
# CPUs and machines.
-common-obj-y = $(block-obj-y) blockdev.o
+common-obj-y = $(shared-obj-y) blockdev.o
common-obj-y += $(net-obj-y)
-common-obj-y += $(qobject-obj-y)
common-obj-$(CONFIG_LINUX) += $(fsdev-obj-$(CONFIG_LINUX))
-common-obj-y += readline.o console.o cursor.o async.o qemu-error.o
-common-obj-y += $(oslib-obj-y)
+common-obj-y += readline.o console.o cursor.o async.o
common-obj-$(CONFIG_WIN32) += os-win32.o
common-obj-$(CONFIG_POSIX) += os-posix.o
@@ -145,7 +149,7 @@ common-obj-y += iov.o acl.o
common-obj-$(CONFIG_THREAD) += qemu-thread.o
common-obj-$(CONFIG_POSIX) += compatfd.o
common-obj-y += notify.o event_notifier.o
-common-obj-y += qemu-timer.o qemu-timer-common.o
+common-obj-y += qemu-timer.o
slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o
slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o
--
1.7.4
- [Qemu-devel] [PATCH 0/2] build: make sharing of objects explicit, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 1/2] build: Create tools-obj-y variable, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 2/2] build: create shared-obj-y for tools/qemu-softmmu,
Juan Quintela <=
- Re: [Qemu-devel] [PATCH 2/2] build: create shared-obj-y for tools/qemu-softmmu, Peter Maydell, 2011/02/24
- Re: [Qemu-devel] [PATCH 2/2] build: create shared-obj-y for tools/qemu-softmmu, Markus Armbruster, 2011/02/24
- [Qemu-devel] Re: [PATCH 2/2] build: create shared-obj-y for tools/qemu-softmmu, Juan Quintela, 2011/02/24
- [Qemu-devel] Re: [PATCH 2/2] build: create shared-obj-y for tools/qemu-softmmu, Markus Armbruster, 2011/02/24
- [Qemu-devel] Re: [PATCH 2/2] build: create shared-obj-y for tools/qemu-softmmu, Paolo Bonzini, 2011/02/24
- [Qemu-devel] Re: [PATCH 2/2] build: create shared-obj-y for tools/qemu-softmmu, Juan Quintela, 2011/02/24