From patchwork Fri Dec 21 16:05:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 207856 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 20E852C0094 for ; Sat, 22 Dec 2012 04:09:29 +1100 (EST) Received: from localhost ([::1]:34948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm59B-0000lZ-10 for incoming@patchwork.ozlabs.org; Fri, 21 Dec 2012 11:08:29 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm57m-00074H-Ah for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:07:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tm57f-0006vZ-9f for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:07:02 -0500 Received: from mail-ia0-f182.google.com ([209.85.210.182]:59234) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm57f-0006vS-3u for qemu-devel@nongnu.org; Fri, 21 Dec 2012 11:06:55 -0500 Received: by mail-ia0-f182.google.com with SMTP id x2so4102340iad.27 for ; Fri, 21 Dec 2012 08:06:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=lQG9f/ydwsVFtZ62mMa5fKKYePBp18YGY1mv8KdD2hU=; b=HKWPqJSRzOmXwYFrhNO699vg0MFcf7Wb2vEP3u4jHoocW9rB46LZhnPmYE7bNN64fI nSS3WEBdJWtSUMja/kPRuMrZGYZ9TSMTFutaH1iLxtBa8bKBuRukqH5KNg4jObmnwDfa bvriNGivHcjE0OcVWCF8dJVT9gp35qe/ngLqKAqhKjN3Q4tIIRoPBYU7TgR+U9p0pN9x sr5gwq0K+2izf8DENyscWySTCAGqpSGpK+igwP98wbLV0273cw1RJm6WKubGc5tpE8lz FxQff/KeoZO8ww/9NmnEArCZzWaHCeg7br2dvjeZin5vqAAFWBncQKaCUE7kgLPoYi6b 2keg== X-Received: by 10.50.1.169 with SMTP id 9mr8885006ign.101.1356106014468; Fri, 21 Dec 2012 08:06:54 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-179-137.ip50.fastwebnet.it. [93.34.179.137]) by mx.google.com with ESMTPS id u4sm9757244igw.6.2012.12.21.08.06.52 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Dec 2012 08:06:53 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 21 Dec 2012 17:05:41 +0100 Message-Id: <1356105948-13216-21-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.0.2 In-Reply-To: <1356105948-13216-1-git-send-email-pbonzini@redhat.com> References: <1356105948-13216-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.210.182 Cc: alevy@redhat.com, vilanova@ac.upc.edu, afaerber@suse.de Subject: [Qemu-devel] [PATCH 20/27] build: consolidate multiple variables into universal-obj-y X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The directory descent mechanism, and a less-flat tree both helped in making some *-obj-y definitions very short. Many of these often end up in universal-obj-y, and used to be separate only because of libuser (which is now part of history...). Consolidate these variables in a single one. Signed-off-by: Paolo Bonzini --- Makefile.objs | 38 ++++++++------------------------------ Makefile.target | 7 +------ qom/Makefile.objs | 6 ++---- 3 files changed, 11 insertions(+), 40 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 0ba9b20..e16f0a3 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -4,17 +4,6 @@ stub-obj-y = stubs/ util-obj-y = util/ qobject/ ####################################################################### -# Target-independent parts used in system and user emulation -universal-obj-y = -universal-obj-y += qemu-log.o - -####################################################################### -# QOM -qom-obj-y = qom/ - -universal-obj-y += $(qom-obj-y) - -####################################################################### # coroutines coroutine-obj-y = qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o coroutine-obj-y += qemu-coroutine-sleep.o @@ -54,7 +43,6 @@ endif common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/ common-obj-y += net/ -common-obj-y += qom/ common-obj-y += readline.o common-obj-$(CONFIG_WIN32) += os-win32.o common-obj-$(CONFIG_POSIX) += os-posix.o @@ -62,7 +50,6 @@ common-obj-$(CONFIG_POSIX) += os-posix.o common-obj-$(CONFIG_LINUX) += fsdev/ extra-obj-$(CONFIG_LINUX) += fsdev/ -common-obj-y += tcg-runtime.o common-obj-y += buffered_file.o migration.o migration-tcp.o common-obj-y += qemu-char.o #aio.o common-obj-y += block-migration.o @@ -95,19 +82,6 @@ common-obj-y += qemu-seccomp.o endif ###################################################################### -# libuser - -user-obj-y = -user-obj-y += tcg-runtime.o -user-obj-y += qom/ - -###################################################################### -# disassemblers -# NOTE: the disassembler code is only needed for debugging - -universal-obj-y += disas/ - -###################################################################### # trace ifeq ($(TRACE_BACKEND),dtrace) @@ -163,8 +137,6 @@ trace-obj-y += trace/control.o $(trace-obj-y): $(GENERATED_HEADERS) -universal-obj-y += $(trace-obj-y) - ###################################################################### # smartcard @@ -185,6 +157,14 @@ qapi-obj-y += qapi-types.o qapi-visit.o common-obj-y += qmp-marshal.o qapi-visit.o qapi-types.o common-obj-y += qmp.o hmp.o +####################################################################### +# Target-independent parts used in system and user emulation +universal-obj-y = +universal-obj-y += qemu-log.o +universal-obj-y += tcg-runtime.o +universal-obj-y += qom/ +universal-obj-y += disas/ +universal-obj-y += $(trace-obj-y) universal-obj-y += $(qapi-obj-y) ###################################################################### @@ -202,10 +182,8 @@ nested-vars += \ stub-obj-y \ util-obj-y \ qga-obj-y \ - qom-obj-y \ qapi-obj-y \ block-obj-y \ - user-obj-y \ common-obj-y \ universal-obj-y \ extra-obj-y diff --git a/Makefile.target b/Makefile.target index da74b22..9cbe6fe 100644 --- a/Makefile.target +++ b/Makefile.target @@ -152,12 +152,7 @@ include $(SRC_PATH)/Makefile.objs all-obj-y = $(obj-y) all-obj-y += $(addprefix ../, $(universal-obj-y)) - -ifdef CONFIG_SOFTMMU -all-obj-y += $(addprefix ../, $(common-obj-y)) -else -all-obj-y += $(addprefix ../, $(user-obj-y)) -endif #CONFIG_LINUX_USER +all-obj-$(CONFIG_SOFTMMU) += $(addprefix ../, $(common-obj-y)) ifdef QEMU_PROGW # The linker builds a windows executable. Make also a console executable. diff --git a/qom/Makefile.objs b/qom/Makefile.objs index 5ef060a..1899a4c 100644 --- a/qom/Makefile.objs +++ b/qom/Makefile.objs @@ -1,4 +1,2 @@ -qom-obj-y = object.o container.o qom-qobject.o -qom-obj-twice-y = cpu.o -common-obj-y = $(qom-obj-twice-y) -user-obj-y = $(qom-obj-twice-y) +universal-obj-y = object.o container.o qom-qobject.o +universal-obj-y += cpu.o