From nobody Sun May 19 14:40:12 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1618298926; cv=none; d=zohomail.com; s=zohoarc; b=Dj9F2giGnGSFMgRAcMlm+pZcspsB/tUKh4CPl6uZ+v+Dm/+Iz/Bgm0oZq7WQY6tSHVYAub6NtZkMlZ8HYgt/F0N+kFwgBeEr6fuXtANq8svV3nk0fdeJjb1rGJUUQW1NdIngNj+YcZtMD0jx5Ti6w5S0MV/2NIYiNRipw9BrzMY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618298926; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=2EorOVnSkaMMSGkvXkZAR5HFb76/MuOZrg2c+nZGoJk=; b=RpQIWkuqZ/tGWb4nxaNy7/ll4m/lI4KEWWUgEglxngZfXsW6xrEBO092Xv8ScHDiP/r5PPf3C7Xg0ebOXk2bDpdIx45cBM5D+HX4TYjq/2SSETKr6iJ3/RVx6VYXDEFI21PBkDixiGVf78z52RkocXRBh+I/wPR3UBB6m9HveyE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1618298926432103.80437633734607; Tue, 13 Apr 2021 00:28:46 -0700 (PDT) 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-326-HloeJ8ifPFGDpRvU23la1Q-1; Tue, 13 Apr 2021 03:28:43 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9ABD71006C81; Tue, 13 Apr 2021 07:28:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 678255C233; Tue, 13 Apr 2021 07:28:38 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0EA6544A5A; Tue, 13 Apr 2021 07:28:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13D7SagN028640 for ; Tue, 13 Apr 2021 03:28:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id E56965DEAD; Tue, 13 Apr 2021 07:28:36 +0000 (UTC) Received: from work.redhat.com (ovpn-113-201.ams2.redhat.com [10.36.113.201]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0EA1C5D9DE; Tue, 13 Apr 2021 07:28:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618298925; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=2EorOVnSkaMMSGkvXkZAR5HFb76/MuOZrg2c+nZGoJk=; b=MGbHZuHQnwozJXWesJzfXwH/ABf0yCPxmk7RmhIQhZ2uOzSVAZXZWZhuRBIGFk/Pf0w4gP MCVRTnStH0LajqH5Z/AQ6/2jJMICqTNi4wuEhHx1HKH/qlKaYho2hFARlsX4avDUqbKb5P Y9BsN/nb1rneGt/dlzl0rjDhtumv9iU= X-MC-Unique: HloeJ8ifPFGDpRvU23la1Q-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2] Remove references to deleted Makefile.am Date: Tue, 13 Apr 2021 09:28:31 +0200 Message-Id: <20210413072831.15180-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Cc: Pavel Hrdina , Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Pavel Hrdina --- src/admin/libvirt_admin_private.syms | 2 +- src/libvirt_private.syms | 2 +- src/libvirt_remote.syms | 2 +- src/vbox/vbox_tmpl.c | 4 ---- tests/testutils.h | 4 ++-- tools/wireshark/README.rst | 3 +-- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/admin/libvirt_admin_private.syms b/src/admin/libvirt_admin= _private.syms index 157a45341e..d9f38a7155 100644 --- a/src/admin/libvirt_admin_private.syms +++ b/src/admin/libvirt_admin_private.syms @@ -1,6 +1,6 @@ # # General private symbols for libvirt_admin. Add symbols here, and see -# Makefile.am for more details. +# src/admin/meson.build for more details. # # Keep this file sorted by header name, then by symbols with each header. # diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 119768496b..b3f9c9681a 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1,5 +1,5 @@ # -# General private symbols. Add symbols here, and see Makefile.am for +# General private symbols. Add symbols here, and see src/meson.build for # more details. # # Keep this file sorted by header name, then by symbols with each header. diff --git a/src/libvirt_remote.syms b/src/libvirt_remote.syms index 605271bcb2..11c9e2cb73 100644 --- a/src/libvirt_remote.syms +++ b/src/libvirt_remote.syms @@ -1,6 +1,6 @@ # # Private symbols used in RPC operations. Add symbols here, and see -# Makefile.am for more details. +# src/remote/meson.build for more details. # # Keep this file sorted by header name, then by symbols with each header. # diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index d37ffd9a6b..182d4c6b75 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1,10 +1,6 @@ /** @file vbox_tmpl.c * Template File to support multiple versions of VirtualBox * at runtime :). - * - * IMPORTANT: - * Please dont include this file in the src/Makefile.am, it - * is automatically include by other files. */ =20 /* diff --git a/tests/testutils.h b/tests/testutils.h index da8ca2dea5..36154e7077 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -30,9 +30,9 @@ #define EXIT_AM_SKIP 77 /* tell Automake we're skipping a test */ #define EXIT_AM_HARDFAIL 99 /* tell Automake that the framework is broken = */ =20 -/* Makefile.am provides these two definitions */ +/* Meson provides these two definitions */ #if !defined(abs_srcdir) || !defined(abs_builddir) -# error Fix Makefile.am +# error Fix build system #endif =20 extern virArch virTestHostArch; diff --git a/tools/wireshark/README.rst b/tools/wireshark/README.rst index 8407557748..48296a11ce 100644 --- a/tools/wireshark/README.rst +++ b/tools/wireshark/README.rst @@ -24,8 +24,7 @@ Then dissector will compiled with libvirt itself. Add/Remove protocol from dissector's support -------------------------------------------- =20 -Modify variable ``WS_DISSECTOR_PROTO_FILES`` -in ``tools/wireshark/src/Makefile.am``. +Modify argument ``input`` in ``tools/wireshark/src/libvirt/meson.build``. =20 Changing installation directory ------------------------------- --=20 2.26.2