From patchwork Mon Aug 3 12:46:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30553 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 41EEBB6F2B for ; Tue, 4 Aug 2009 00:34:56 +1000 (EST) Received: from localhost ([127.0.0.1]:42979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXyck-00013a-6K for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 10:34:50 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXwze-0003gU-0r for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXwzZ-0003cy-9s for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:21 -0400 Received: from [199.232.76.173] (port=51706 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXwzZ-0003cr-4a for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:17 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40859) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXwzY-00077l-Dn for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:16 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73CoFmr007145; Mon, 3 Aug 2009 08:50:15 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n73CoEdS026708; Mon, 3 Aug 2009 08:50:15 -0400 Received: from localhost.localdomain (vpn-12-117.rdu.redhat.com [10.11.12.117]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n73Cn8Ms009715; Mon, 3 Aug 2009 08:50:13 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:46:41 +0200 Message-Id: <5e1fd6817a1627951b34553d568a7a82ca987d62.1249301360.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: aliguori@us.ibm.com Subject: [Qemu-devel] [PATCH 50/81] \!CONFIG_USER_ONLY == CONFIG_SOFTMMU X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Use this to simplify Makefile.target and remove negative logic Signed-off-by: Juan Quintela --- Makefile.target | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile.target b/Makefile.target index 5c3b212..6234648 100644 --- a/Makefile.target +++ b/Makefile.target @@ -77,9 +77,7 @@ endif ifeq ($(TARGET_BASE_ARCH), cris) libobj-y += cris-dis.o -ifndef CONFIG_USER_ONLY -libobj-y += mmu.o -endif +libobj-$(CONFIG_SOFTMMU) += mmu.o endif # NOTE: the disassembler code is only needed for debugging @@ -99,9 +97,7 @@ libobj-y += ppc-dis.o endif ifeq ($(findstring microblaze, $(TARGET_BASE_ARCH) $(ARCH)),microblaze) libobj-y += microblaze-dis.o -ifndef CONFIG_USER_ONLY -libobj-y += mmu.o -endif +libobj-$(CONFIG_SOFTMMU) += mmu.o endif ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips) libobj-y += mips-dis.o @@ -217,7 +213,7 @@ endif #CONFIG_BSD_USER ######################################################### # System emulator target -ifndef CONFIG_USER_ONLY +ifdef CONFIG_SOFTMMU obj-y = vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o \ gdbstub.o gdbstub-xml.o msix.o ioport.o @@ -398,7 +394,7 @@ monitor.o: qemu-monitor.h LIBS += $(COCOA_LIBS) $(VDE_LIBS) $(CURL_LIBS) ARLIBS=../libqemu_common.a libqemu.a $(HWLIB) -endif # !CONFIG_USER_ONLY +endif # CONFIG_SOFTMMU $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(ARLIBS) $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))