Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- 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 = $(sysconfdir)/libvirt conf_DATA = bin_SCRIPTS = virt-xml-validate virt-pki-validate -bin_PROGRAMS = virt-admin libexec_SCRIPTS = libvirt-guests.sh if WITH_SANLOCK @@ -53,25 +52,6 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile noinst_LTLIBRARIES = -virt_admin_SOURCES = \ - virt-admin.c virt-admin.h \ - virt-admin-completer.c virt-admin-completer.h \ - $(NULL) - -virt_admin_LDFLAGS = \ - $(AM_LDFLAGS) \ - $(COVERAGE_LDFLAGS) \ - $(STATIC_BINARIES) \ - $(NULL) -virt_admin_LDADD = \ - ../src/libvirt-admin.la \ - libvirt_shell.la \ - $(LIBXML_LIBS) \ - $(NULL) -virt_admin_CFLAGS = \ - $(AM_CFLAGS) \ - $(READLINE_CFLAGS) - install-data-local: install-systemd install-nss \ install-bash-completion 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, +) -- 2.26.2
