From nobody Sun Feb 8 13:13:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1594894636; cv=none; d=zohomail.com; s=zohoarc; b=T02VUtNCocoe/qChEKuI9ew3YFhyeEgvinZ8Vorx0SD0GUQ43d9xbhSS6OD0XxMNEkxITmIwHjqq5jmm45FdV0HOzAJOmTXJw26P7lQBrTkg7IBG5jsk853a+gRyXWN1XZHkcbXhlEl0K2ZPOSfr+rL1CxhwRGQYd8cEshZKWyA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894636; 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=AoaHLYxdkD0ilKV6Vg0tmIn98K+8XkYSGEbOs9uv+PQ=; b=hZg6P74wdx4TZV2AWzoWELh++YYZ0LoNPVSoMYSC4Kyn4E3qpJfPgH8kISRvewR4eLJW0Ua41p8blMqTFtgJBGlN33pnisa7ynaCHDWbthKrF76ooTiNof2Ijo864mYDkJ0jnDHFuDo2rZGTdqpzbDa9n0Bxhy3MnIsKv+bvNSE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594894636085626.1453850685444; Thu, 16 Jul 2020 03:17:16 -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-312-W4D_QqHDMxeuPLtd7V57OQ-1; Thu, 16 Jul 2020 06:10:21 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F321D10059AA; Thu, 16 Jul 2020 10:10:11 +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 D688072ACF; Thu, 16 Jul 2020 10:10:11 +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 A1100181A8CC; Thu, 16 Jul 2020 10:10:11 +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 06GA6JRl019501 for ; Thu, 16 Jul 2020 06:06:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id AAC192B6DB; Thu, 16 Jul 2020 10:06:19 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 24E192B6E6 for ; Thu, 16 Jul 2020 10:06:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894634; 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=AoaHLYxdkD0ilKV6Vg0tmIn98K+8XkYSGEbOs9uv+PQ=; b=hsLeKqXSQfPrEFaHPSLbZZ3Dv2bk+ZTnwkD71E6rscMkLS30v2BgpFIMO3sigHod0it1bH QZaiIdFw9CQYnZVQdr92Dy/8eFVRuJvqVqMSxDo8b7J6ms5jUEBK9NZOrA55sTPBSwD+tf M0PjNdgxXbdaeMzmoDekZyjIBJfk848= X-MC-Unique: W4D_QqHDMxeuPLtd7V57OQ-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 259/351] meson: tools: build virsh binary Date: Thu, 16 Jul 2020 11:58:15 +0200 Message-Id: <03edbc5d9fdc55bc9c18468b7ec8f5a9289b4cbe.1594891445.git.phrdina@redhat.com> 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.15 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 | 50 +--------------------------------------------- tools/meson.build | 51 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 49 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 4f4adf94382..2cf165dffdf 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -25,7 +25,7 @@ confdir =3D $(sysconfdir)/libvirt conf_DATA =3D =20 bin_SCRIPTS =3D virt-xml-validate virt-pki-validate -bin_PROGRAMS =3D virsh virt-admin +bin_PROGRAMS =3D virt-admin libexec_SCRIPTS =3D libvirt-guests.sh =20 if WITH_SANLOCK @@ -53,50 +53,6 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile =20 noinst_LTLIBRARIES =3D =20 -virsh_SOURCES =3D \ - virsh.c virsh.h \ - virsh-backup.c virsh-backup.h \ - virsh-checkpoint.c virsh-checkpoint.h \ - virsh-completer.c virsh-completer.h \ - virsh-completer-domain.c virsh-completer-domain.h \ - virsh-completer-checkpoint.c virsh-completer-checkpoint.h \ - virsh-completer-host.c virsh-completer-host.h \ - virsh-completer-interface.c virsh-completer-interface.h \ - virsh-completer-network.c virsh-completer-network.h \ - virsh-completer-nodedev.c virsh-completer-nodedev.h \ - virsh-completer-nwfilter.c virsh-completer-nwfilter.h \ - virsh-completer-pool.c virsh-completer-pool.h \ - virsh-completer-secret.c virsh-completer-secret.h \ - virsh-completer-snapshot.c virsh-completer-snapshot.h \ - virsh-completer-volume.c virsh-completer-volume.h \ - virsh-console.c virsh-console.h \ - virsh-domain.c virsh-domain.h \ - virsh-domain-monitor.c virsh-domain-monitor.h \ - virsh-host.c virsh-host.h \ - virsh-interface.c virsh-interface.h \ - virsh-network.c virsh-network.h \ - virsh-nodedev.c virsh-nodedev.h \ - virsh-nwfilter.c virsh-nwfilter.h \ - virsh-pool.c virsh-pool.h \ - virsh-secret.c virsh-secret.h \ - virsh-snapshot.c virsh-snapshot.h \ - virsh-util.c virsh-util.h \ - virsh-volume.c virsh-volume.h \ - $(NULL) - -virsh_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - $(NULL) -virsh_LDADD =3D \ - $(STATIC_BINARIES) \ - ../src/libvirt-lxc.la \ - ../src/libvirt-qemu.la \ - libvirt_shell.la -virsh_CFLAGS =3D \ - $(AM_CFLAGS) \ - $(READLINE_CFLAGS) - virt_admin_SOURCES =3D \ virt-admin.c virt-admin.h \ virt-admin-completer.c virt-admin-completer.h \ @@ -116,10 +72,6 @@ virt_admin_CFLAGS =3D \ $(AM_CFLAGS) \ $(READLINE_CFLAGS) =20 -if WITH_WIN_ICON -virsh_LDADD +=3D virsh_win_icon.$(OBJEXT) -endif WITH_WIN_ICON - install-data-local: install-systemd install-nss \ install-bash-completion =20 diff --git a/tools/meson.build b/tools/meson.build index c110cfcf177..20523b400bd 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -142,3 +142,54 @@ if host_machine.system() =3D=3D 'windows' else virsh_icon_res =3D [] endif + +executable( + 'virsh', + [ + 'virsh.c', + 'virsh-backup.c', + 'virsh-checkpoint.c', + 'virsh-completer.c', + 'virsh-completer-domain.c', + 'virsh-completer-checkpoint.c', + 'virsh-completer-host.c', + 'virsh-completer-interface.c', + 'virsh-completer-network.c', + 'virsh-completer-nodedev.c', + 'virsh-completer-nwfilter.c', + 'virsh-completer-pool.c', + 'virsh-completer-secret.c', + 'virsh-completer-snapshot.c', + 'virsh-completer-volume.c', + 'virsh-console.c', + 'virsh-domain.c', + 'virsh-domain-monitor.c', + 'virsh-host.c', + 'virsh-interface.c', + 'virsh-network.c', + 'virsh-nodedev.c', + 'virsh-nwfilter.c', + 'virsh-pool.c', + 'virsh-secret.c', + 'virsh-snapshot.c', + 'virsh-util.c', + 'virsh-volume.c', + virsh_icon_res, + ], + dependencies: [ + tools_dep, + readline_dep, + thread_dep, + ], + link_args: [ + coverage_flags, + ], + link_with: [ + libvirt_lxc_lib, + libvirt_qemu_lib, + libvirt_shell_lib, + ], + install: true, + install_dir: bindir, + install_rpath: libdir, +) --=20 2.26.2