From nobody Tue Nov 26 22:20:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1704012845; cv=none; d=zohomail.com; s=zohoarc; b=OrMGeeVpuHkxn/BKwQq1dh56ih8qb9gmQkv8S5tdXqUXM3dR0bURnpkQOYsA4pv8nK9Sv9wYjIisRIEQJ+bfT+vU8ouSoxzWr1EnAkMvLekKeCR727akL9KORrA6wKbG6+qw7jqfwQwfACOM/8w50YeoApLJ2GF9hK+9L2YP3Wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1704012845; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WKXmM8oXPCPksLCP66tG+EIx4J0iQKzlOhC0Ov9a3p0=; b=nj9CBj44b6eAxlZG4emxN9JJAXKtG5Vj1Ki4nRP2i8cWXP/sOoYUeqeswoEtew7TMU+o/tRNLXXtMMljIcc5KuxjIKVuAvHiCg9xV1fjuoD7hUH/apJ3JwUuTpC24OShwN5rfwE4AkfnYCzr3NP+MbHDL8++QPg52EzrjWt6GPo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1704012845068510.8142392280354; Sun, 31 Dec 2023 00:54:05 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJrUu-0008BE-Ik; Sun, 31 Dec 2023 03:48:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJrTD-0005On-NZ for qemu-devel@nongnu.org; Sun, 31 Dec 2023 03:46:59 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rJrT6-0000sM-61 for qemu-devel@nongnu.org; Sun, 31 Dec 2023 03:46:54 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-642-3gwouVUZPZewJu2_opyzNQ-1; Sun, 31 Dec 2023 03:46:43 -0500 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-40d3b0783beso74149785e9.3 for ; Sun, 31 Dec 2023 00:46:43 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id bg42-20020a05600c3caa00b0040d6b91efd9sm11301036wmb.44.2023.12.31.00.46.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 00:46:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704012405; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=WKXmM8oXPCPksLCP66tG+EIx4J0iQKzlOhC0Ov9a3p0=; b=WaI5r2GyeURyL3fYrke8fTRc93td6Y4Bc1FmLYbGd30+6tv90V/qSPPMV2ZkGGcd8a7Ey8 UA6F99wwe47m78zkoM8UT7OMSF/Cq9aAczkwgTorqzwvEBf8Iu47x7jurbHxwkeIhHppq/ qRfhLQhwgr3RE/PU6a+b/g5fd4OjTkw= X-MC-Unique: 3gwouVUZPZewJu2_opyzNQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704012402; x=1704617202; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WKXmM8oXPCPksLCP66tG+EIx4J0iQKzlOhC0Ov9a3p0=; b=huYdSQfwOobcupWwSQq92AFkIu8L2vVjyVlMbkliEHSxtburX3TpoVXxNrzQCb2ps2 LYoHaC7T+jDzswafRV87P2eNFroGvo7jyx/6vB7TcUdj8zN7Zfa2wlXXkq9fyAd5ou/j ZqLM3s2annUlkTNkLRhVDxSdeXYM/hLZhHbhRWmN8ZJD+/MV+7pgOLRtzbWLFWYWPA7B tAZQiJbPqmf8ZQmyXINja3VTlVEZxOyjdfAn+bxJzmj0jyyi6MfBZyEqbXME3i9AOVO/ QLRtfjLWSYHwgB3hbsaS6r93ucLS6dE4UimNi2C34RbxEdouInKFnAKDaw8VUDU6WRBa bm9Q== X-Gm-Message-State: AOJu0YyutChXV56xr6By/v69RzoG0hCN8M/HS0t1OszPpAcDzjq4OdWc rIoWaY8+JRoMb5gO0zSrduuuiFqi4Tdsxdj6zcmzFVztTeudvoJ22pzgOetJi8bLqF6SoFSEVGU VFRfHFxm4gbjKYo7tj5t+Xr3vVwJNEzNnDxmQfCrujzRGnX25WlSXgur3RNJAxH+TMMXKKxTO17 GZIYRgnh4= X-Received: by 2002:a05:600c:4e8f:b0:40d:5f55:5d4 with SMTP id f15-20020a05600c4e8f00b0040d5f5505d4mr2977005wmq.13.1704012402224; Sun, 31 Dec 2023 00:46:42 -0800 (PST) X-Google-Smtp-Source: AGHT+IELzC4w8dPQXmZk21UjrlQjDLW1/CFHEqvlacawel/03VVNfqxeWRcuFucV2CSxSHWTZ2eMxQ== X-Received: by 2002:a05:600c:4e8f:b0:40d:5f55:5d4 with SMTP id f15-20020a05600c4e8f00b0040d5f5505d4mr2976999wmq.13.1704012401885; Sun, 31 Dec 2023 00:46:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 38/46] meson: move subdirs to "Collect sources" section Date: Sun, 31 Dec 2023 09:44:54 +0100 Message-ID: <20231231084502.235366-39-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231231084502.235366-1-pbonzini@redhat.com> References: <20231231084502.235366-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -47 X-Spam_score: -4.8 X-Spam_bar: ---- X-Spam_report: (-4.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.667, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1704012845522100001 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- meson.build | 66 ++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/meson.build b/meson.build index 151db21c038..21335055ef8 100644 --- a/meson.build +++ b/meson.build @@ -3257,39 +3257,6 @@ foreach d : hx_headers endforeach genh +=3D hxdep =20 -################### -# Collect sources # -################### - -authz_ss =3D ss.source_set() -blockdev_ss =3D ss.source_set() -block_ss =3D ss.source_set() -chardev_ss =3D ss.source_set() -common_ss =3D ss.source_set() -crypto_ss =3D ss.source_set() -hwcore_ss =3D ss.source_set() -io_ss =3D ss.source_set() -qmp_ss =3D ss.source_set() -qom_ss =3D ss.source_set() -system_ss =3D ss.source_set() -specific_fuzz_ss =3D ss.source_set() -specific_ss =3D ss.source_set() -stub_ss =3D ss.source_set() -trace_ss =3D ss.source_set() -user_ss =3D ss.source_set() -util_ss =3D ss.source_set() - -# accel modules -qtest_module_ss =3D ss.source_set() -tcg_module_ss =3D ss.source_set() - -modules =3D {} -target_modules =3D {} -hw_arch =3D {} -target_arch =3D {} -target_system_arch =3D {} -target_user_arch =3D {} - ############### # Trace files # ############### @@ -3404,6 +3371,39 @@ if have_system or have_user ] endif =20 +################### +# Collect sources # +################### + +authz_ss =3D ss.source_set() +blockdev_ss =3D ss.source_set() +block_ss =3D ss.source_set() +chardev_ss =3D ss.source_set() +common_ss =3D ss.source_set() +crypto_ss =3D ss.source_set() +hwcore_ss =3D ss.source_set() +io_ss =3D ss.source_set() +qmp_ss =3D ss.source_set() +qom_ss =3D ss.source_set() +system_ss =3D ss.source_set() +specific_fuzz_ss =3D ss.source_set() +specific_ss =3D ss.source_set() +stub_ss =3D ss.source_set() +trace_ss =3D ss.source_set() +user_ss =3D ss.source_set() +util_ss =3D ss.source_set() + +# accel modules +qtest_module_ss =3D ss.source_set() +tcg_module_ss =3D ss.source_set() + +modules =3D {} +target_modules =3D {} +hw_arch =3D {} +target_arch =3D {} +target_system_arch =3D {} +target_user_arch =3D {} + # NOTE: the trace/ subdirectory needs the qapi_trace_events variable # that is filled in by qapi/. subdir('qapi') --=20 2.43.0