From nobody Sun Feb 8 18:33:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1594894830; cv=none; d=zohomail.com; s=zohoarc; b=OcmZW6LnM3cHxDnL7fetplnGEcpA+j/3OuGMGMABKHPELutHkp6NHtDccdytaDOXpu7QTyMJBId9XK/UVbodCvS8vV8HHVI90ax5SUKAD52c82kIKOZvynYSIbSSLFlckPODfkMn2IuMU5L3aFYB517+EqsEj9+i2xVLDpFnh+o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894830; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VtLnE1R08Y4VUyID5UtZQeBAnh/SQ7Bs9AcrzIXomjg=; b=C14lIEiEOUaqOpTQZ7zlt+uMEvjJOVGlKfij44JzrolmnSzocTRvoY/3NDk0/7P+pl0ohChQ7yYo2oBtcdmlocrz4IwP3UWw1jI6B+SjiRP7dPBmPfRYQ42xBzcQEvlNg1O/MQNfPIk8J3g3mrcqameQrHgcZD8mNEJqr8OK/So= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 15948948305691000.1058734667022; Thu, 16 Jul 2020 03:20:30 -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-175-3w63dVPwPmyaTNB0cB6snQ-1; Thu, 16 Jul 2020 06:13:59 -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 D6D5180BCA8; Thu, 16 Jul 2020 10:13:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B55CD5C5B7; Thu, 16 Jul 2020 10:13:53 +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 81B75181D0A4; Thu, 16 Jul 2020 10:13:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA6KlF019517 for ; Thu, 16 Jul 2020 06:06:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 92E462B6DC; Thu, 16 Jul 2020 10:06:20 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0DE842B6DB for ; Thu, 16 Jul 2020 10:06:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894829; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=VtLnE1R08Y4VUyID5UtZQeBAnh/SQ7Bs9AcrzIXomjg=; b=ATGnDLIZhQ3pbF382tz3pezRBveqBV/TaLg5nfrhEfmZ/vb/ZN7bRmBGHRGxklGkHoCvEa gxMHRrPLv/A78OvsD05k8W+S7QE7Y+K0GfzFhOZTepMP7861iNxhbg8ETNu/ipYguGNtYb lPc1nYcdfSOXxX4Um0+v5hV7jzFPmU8= X-MC-Unique: 3w63dVPwPmyaTNB0cB6snQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 260/351] meson: tools: build virt-admin binary Date: Thu, 16 Jul 2020 11:58:16 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com 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 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: Pavel Hrdina --- tools/Makefile.am | 20 -------------------- tools/meson.build | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 2cf165dffdf..5a0614756f9 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -25,7 +25,6 @@ confdir =3D $(sysconfdir)/libvirt conf_DATA =3D =20 bin_SCRIPTS =3D virt-xml-validate virt-pki-validate -bin_PROGRAMS =3D virt-admin libexec_SCRIPTS =3D libvirt-guests.sh =20 if WITH_SANLOCK @@ -53,25 +52,6 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile =20 noinst_LTLIBRARIES =3D =20 -virt_admin_SOURCES =3D \ - virt-admin.c virt-admin.h \ - virt-admin-completer.c virt-admin-completer.h \ - $(NULL) - -virt_admin_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - $(STATIC_BINARIES) \ - $(NULL) -virt_admin_LDADD =3D \ - ../src/libvirt-admin.la \ - libvirt_shell.la \ - $(LIBXML_LIBS) \ - $(NULL) -virt_admin_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(READLINE_CFLAGS) - install-data-local: install-systemd install-nss \ install-bash-completion =20 diff --git a/tools/meson.build b/tools/meson.build index 20523b400bd..d2d82903f1c 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -193,3 +193,25 @@ executable( install_dir: bindir, install_rpath: libdir, ) + +executable( + 'virt-admin', + [ + 'virt-admin.c', + 'virt-admin-completer.c', + ], + dependencies: [ + tools_dep, + readline_dep, + ], + link_args: [ + coverage_flags, + ], + link_with: [ + libvirt_admin_lib, + libvirt_shell_lib, + ], + install: true, + install_dir: bindir, + install_rpath: libdir, +) --=20 2.26.2