From patchwork Mon Aug 3 12:47:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 30575 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 5C0A0B6F2B for ; Tue, 4 Aug 2009 01:37:24 +1000 (EST) Received: from localhost ([127.0.0.1]:40339 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXzbF-0002kl-Nr for incoming@patchwork.ozlabs.org; Mon, 03 Aug 2009 11:37:21 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXx03-0003yn-Oz for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:47 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXx00-0003wi-PB for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:47 -0400 Received: from [199.232.76.173] (port=51738 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXx00-0003we-HP for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:44 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40914) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXwzz-0007EX-Pz for qemu-devel@nongnu.org; Mon, 03 Aug 2009 08:50:44 -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 n73Coh7W007470; Mon, 3 Aug 2009 08:50:43 -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 n73Cogr2027042; Mon, 3 Aug 2009 08:50:42 -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 n73Cn8NF009715; Mon, 3 Aug 2009 08:50:41 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 3 Aug 2009 14:47:02 +0200 Message-Id: <499b581f23312db9ddb0f85c647af5422692ab85.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 71/81] Consolidate audio flags in configure 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 Signed-off-by: Juan Quintela --- Makefile.target | 17 ----------------- configure | 11 +++++++++++ 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/Makefile.target b/Makefile.target index 6b3d40f..22d1d53 100644 --- a/Makefile.target +++ b/Makefile.target @@ -202,10 +202,6 @@ obj-i386-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o -ifeq ($(TARGET_BASE_ARCH), i386) -QEMU_CFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE -endif - # shared objects obj-ppc-y = ppc.o ide.o vga.o $(sound-obj-y) dma.o openpic.o # PREP target @@ -223,11 +219,6 @@ obj-ppc-y += ppc440.o ppc440_bamboo.o # PowerPC E500 boards obj-ppc-y += ppce500_pci.o ppce500_mpc8544ds.o obj-ppc-$(CONFIG_KVM) += kvm_ppc.o - -ifeq ($(TARGET_BASE_ARCH), ppc) -QEMU_CFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE -endif - obj-ppc-$(CONFIG_FDT) += device_tree.o obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o @@ -239,10 +230,6 @@ obj-mips-y += mipsnet.o obj-mips-y += pflash_cfi01.o obj-mips-y += vmware_vga.o -ifeq ($(TARGET_BASE_ARCH), mips) -QEMU_CFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE -endif - obj-microblaze-y = petalogix_s3adsp1800_mmu.o obj-microblaze-y += microblaze_pic_cpu.o @@ -299,10 +286,6 @@ obj-arm-y += syborg.o syborg_fb.o syborg_interrupt.o syborg_keyboard.o obj-arm-y += syborg_serial.o syborg_timer.o syborg_pointer.o syborg_rtc.o obj-arm-y += syborg_virtio.o -ifeq ($(TARGET_BASE_ARCH), arm) -QEMU_CFLAGS += -DHAS_AUDIO -endif - obj-sh4-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o obj-sh4-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o serial.o obj-sh4-y += ide.o diff --git a/configure b/configure index 9bc2303..ccf0fa2 100755 --- a/configure +++ b/configure @@ -2134,6 +2134,17 @@ ia64) ;; esac +if test "$target_softmmu" = "yes" ; then + case "$TARGET_BASE_ARCH" in + arm) + cflags="-DHAS_AUDIO $cflags" + ;; + i386|mips|ppc) + cflags="-DHAS_AUDIO -DHAS_AUDIO_CHOICE $cflags" + ;; + esac +fi + if test "$target_softmmu" = "yes" -a \( \ "$TARGET_ARCH" = "microblaze" -o \ "$TARGET_ARCH" = "cris" \) ; then