From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDeSG-000453-H9 for qemu-devel@nongnu.org; Mon, 17 Sep 2012 12:45:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDeS9-0000K4-6S for qemu-devel@nongnu.org; Mon, 17 Sep 2012 12:45:52 -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 1TDeS8-0000Dv-Q8 for qemu-devel@nongnu.org; Mon, 17 Sep 2012 12:45:45 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp12so9862193pbb.4 for ; Mon, 17 Sep 2012 09:45:44 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 17 Sep 2012 18:45:01 +0200 Message-Id: <1347900303-24314-8-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 7/9] build: use nesting magic for tools-obj-y 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 Move this variable to Makefile.objs, together with all the other lists of object files. Signed-off-by: Paolo Bonzini --- Makefile | 5 ----- Makefile.objs | 9 +++++++++ 2 file modificati, 9 inserzioni(+), 5 rimozioni(-) diff --git a/Makefile b/Makefile index fffbbb8..a8078ec 100644 --- a/Makefile +++ b/Makefile @@ -152,11 +152,6 @@ 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 monitor-dummy.o \ - iohandler.o -tools-obj-$(CONFIG_POSIX) += compatfd.o - qemu-img$(EXESUF): qemu-img.o $(tools-obj-y) $(block-obj-y) qemu-nbd$(EXESUF): qemu-nbd.o $(tools-obj-y) $(block-obj-y) qemu-io$(EXESUF): qemu-io.o cmd.o $(tools-obj-y) $(block-obj-y) diff --git a/Makefile.objs b/Makefile.objs index cf00fd5..85bd70b 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -226,6 +226,14 @@ common-obj-y += qmp.o hmp.o universal-obj-y += $(qapi-obj-y) ###################################################################### +# tools-obj-y is shared by qemu-img, qemu-io, qemu-nbd + +tools-obj-y = $(oslib-obj-y) $(trace-obj-y) qemu-tool.o qemu-timer.o +tools-obj-y += qemu-timer-common.o main-loop.o notify.o monitor-dummy.o +tools-obj-y += iohandler.o +tools-obj-$(CONFIG_POSIX) += compatfd.o + +###################################################################### # guest agent qga-obj-y = qga/ qemu-ga.o module.o monitor-dummy.o @@ -246,5 +254,6 @@ nested-vars += \ qapi-obj-y \ user-obj-y \ common-obj-y \ + tools-obj-y \ extra-obj-y dummy := $(call unnest-vars) -- 1.7.12