From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18896C2D0C0 for ; Thu, 19 Dec 2019 12:26:40 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DC96024650 for ; Thu, 19 Dec 2019 12:26:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Crq5W09H" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC96024650 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihut4-0001GS-KT for qemu-devel@archiver.kernel.org; Thu, 19 Dec 2019 07:26:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59559) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihuqz-0007he-FY for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihuqy-0007I3-2B for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:29 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34617 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihuqx-0007Ep-Ql for qemu-devel@nongnu.org; Thu, 19 Dec 2019 07:24:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576758267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9UmZA/EQkfFvwW1LST0o+SJaN2u7CPZNAGY4rHWJntk=; b=Crq5W09HQlIhAuRsU47pN7rqAihwtJ2TEtCALtKBNGZZ+FZHlpb+lQ+APE/6EQHYu+vEt0 3MuX5ncgAyaptggQyNXmqkHaicx1B8ygWh9OWZWAQIPQP3EleKsMX9hExDAW+4/q8m2dOO dyBFrtN3Tjl48IMiN+dHYOY3C8g2AVE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-164-8etFbDDZPoKwx1g8vxF1QA-1; Thu, 19 Dec 2019 07:24:25 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9493A10054E3 for ; Thu, 19 Dec 2019 12:24:24 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A98260C81; Thu, 19 Dec 2019 12:24:19 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 100/132] meson: convert hw/audio Date: Thu, 19 Dec 2019 13:23:20 +0100 Message-Id: <1576758232-12439-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 8etFbDDZPoKwx1g8vxF1QA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- hw/Makefile.objs | 1 - hw/audio/Makefile.objs | 18 ------------------ hw/audio/meson.build | 14 ++++++++++++++ hw/meson.build | 1 + 4 files changed, 15 insertions(+), 19 deletions(-) delete mode 100644 hw/audio/Makefile.objs create mode 100644 hw/audio/meson.build diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 0c92a04..c69c3aa 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -2,7 +2,6 @@ ifeq ($(CONFIG_SOFTMMU), y) devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call land,$(CONFIG_VIRTFS),$= (CONFIG_XEN))) +=3D 9pfs/ devices-dirs-y +=3D acpi/ devices-dirs-y +=3D adc/ -devices-dirs-y +=3D audio/ endif =20 common-obj-y +=3D $(devices-dirs-y) diff --git a/hw/audio/Makefile.objs b/hw/audio/Makefile.objs deleted file mode 100644 index 63db383..0000000 --- a/hw/audio/Makefile.objs +++ /dev/null @@ -1,18 +0,0 @@ -# Sound -common-obj-$(CONFIG_SB16) +=3D sb16.o -common-obj-$(CONFIG_ES1370) +=3D es1370.o -common-obj-$(CONFIG_AC97) +=3D ac97.o -common-obj-$(CONFIG_ADLIB) +=3D fmopl.o adlib.o -common-obj-$(CONFIG_GUS) +=3D gus.o gusemu_hal.o gusemu_mixer.o -common-obj-$(CONFIG_CS4231A) +=3D cs4231a.o -common-obj-$(CONFIG_HDA) +=3D intel-hda.o hda-codec.o - -common-obj-$(CONFIG_PCSPK) +=3D pcspk.o -common-obj-$(CONFIG_WM8750) +=3D wm8750.o -common-obj-$(CONFIG_PL041) +=3D pl041.o lm4549.o - -common-obj-$(CONFIG_CS4231) +=3D cs4231.o -common-obj-$(CONFIG_MARVELL_88W8618) +=3D marvell_88w8618.o -common-obj-$(CONFIG_MILKYMIST) +=3D milkymist-ac97.o - -common-obj-y +=3D soundhw.o diff --git a/hw/audio/meson.build b/hw/audio/meson.build new file mode 100644 index 0000000..549e9a0 --- /dev/null +++ b/hw/audio/meson.build @@ -0,0 +1,14 @@ +softmmu_ss.add(files('soundhw.c')) +softmmu_ss.add(when: 'CONFIG_AC97', if_true: files('ac97.c')) +softmmu_ss.add(when: 'CONFIG_ADLIB', if_true: files('fmopl.c', 'adlib.c')) +softmmu_ss.add(when: 'CONFIG_CS4231', if_true: files('cs4231.c')) +softmmu_ss.add(when: 'CONFIG_CS4231A', if_true: files('cs4231a.c')) +softmmu_ss.add(when: 'CONFIG_ES1370', if_true: files('es1370.c')) +softmmu_ss.add(when: 'CONFIG_GUS', if_true: files('gus.c', 'gusemu_hal.c',= 'gusemu_mixer.c')) +softmmu_ss.add(when: 'CONFIG_HDA', if_true: files('intel-hda.c', 'hda-code= c.c')) +softmmu_ss.add(when: 'CONFIG_MARVELL_88W8618', if_true: files('marvell_88w= 8618.c')) +softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-ac97.c'= )) +softmmu_ss.add(when: 'CONFIG_PCSPK', if_true: files('pcspk.c')) +softmmu_ss.add(when: 'CONFIG_PL041', if_true: files('pl041.c', 'lm4549.c')= ) +softmmu_ss.add(when: 'CONFIG_SB16', if_true: files('sb16.c')) +softmmu_ss.add(when: 'CONFIG_WM8750', if_true: files('wm8750.c')) diff --git a/hw/meson.build b/hw/meson.build index a6782a5..011139d 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,3 +1,4 @@ +subdir('audio') subdir('block') subdir('bt') subdir('char') --=20 1.8.3.1