From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39356) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDeS2-0003MU-39 for qemu-devel@nongnu.org; Mon, 17 Sep 2012 12:45:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDeRw-0000E4-2u for qemu-devel@nongnu.org; Mon, 17 Sep 2012 12:45:38 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:47895) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDeRv-0000Dv-T8 for qemu-devel@nongnu.org; Mon, 17 Sep 2012 12:45:32 -0400 Received: by pbbrp12 with SMTP id rp12so9862193pbb.4 for ; Mon, 17 Sep 2012 09:45:31 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 17 Sep 2012 18:44:57 +0200 Message-Id: <1347900303-24314-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1347900303-24314-1-git-send-email-pbonzini@redhat.com> References: <1347900303-24314-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 3/9] build: avoid duplicate appearance of files List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, afaerber@suse.de cutils.c and iov.c appeared in the Makefile in multiple spots. Clean this up by moving them respectively to oslib-obj-y and block-obj-y. Notably, qemu-ga and user-mode emulation both need cutils.c but not iov.c. async.o was linked in tools via both tools-obj-y and block-obj-y. Remove the former, which is unnecessary. Signed-off-by: Paolo Bonzini --- Makefile | 2 +- Makefile.objs | 8 ++++---- 2 file modificati, 5 inserzioni(+), 5 rimozioni(-) diff --git a/Makefile b/Makefile index 6426d85..5240834 100644 --- a/Makefile +++ b/Makefile @@ -154,7 +154,7 @@ 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 monitor-dummy.o \ - iohandler.o cutils.o iov.o async.o + iohandler.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 abb7d0f..cf00fd5 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 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 aio.o aes.o qemu-config.o qemu-progress.o qemu-sockets.o block-obj-y += $(coroutine-obj-y) $(qobject-obj-y) $(version-obj-y) block-obj-$(CONFIG_POSIX) += posix-aio-compat.o @@ -89,7 +89,7 @@ common-obj-y += hw/ common-obj-y += ui/ common-obj-y += bt-host.o bt-vhci.o -common-obj-y += iov.o acl.o +common-obj-y += acl.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 @@ -108,7 +108,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