meson: tools: build virt-login-shell-helper binary

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 51507ba1e379227c77b0d50e8d6911dc910af6aa..d5fa2765e80dec3331a8df9094dbf11aed1387f1 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -41,7 +41,6 @@ endif WITH_SANLOCK
 
 if WITH_LOGIN_SHELL
 conf_DATA += virt-login-shell.conf
-libexec_PROGRAMS = virt-login-shell-helper
 endif WITH_LOGIN_SHELL
 
 virt-xml-validate: virt-xml-validate.in Makefile
@@ -61,23 +60,6 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile
 
 noinst_LTLIBRARIES =
 
-virt_login_shell_helper_SOURCES = \
-               virt-login-shell-helper.c
-
-virt_login_shell_helper_LDFLAGS = \
-               $(AM_LDFLAGS) \
-               $(COVERAGE_LDFLAGS) \
-               $(NULL)
-virt_login_shell_helper_LDADD = \
-               ../src/libvirt.la \
-               ../src/libvirt-lxc.la \
-               $(GLIB_LIBS) \
-               $(NULL)
-
-virt_login_shell_helper_CFLAGS = \
-               $(AM_CFLAGS) \
-               $(NULL)
-
 virsh_SOURCES = \
                virsh.c virsh.h \
                virsh-backup.c virsh-backup.h \

diff --git a/tools/meson.build b/tools/meson.build
index 183620e33a9d759f240bab997e8e2283291391f8..45ab8b24bd40fc5f2866c96a027d4dfe6265c91e 100644 (file)
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -94,4 +94,24 @@ if conf.has('WITH_LOGIN_SHELL')
     install: true,
     install_dir: bindir,
   )
+
+  executable(
+    'virt-login-shell-helper',
+    [
+      'virt-login-shell-helper.c',
+    ],
+    dependencies: [
+      tools_dep,
+    ],
+    link_args: [
+      coverage_flags,
+    ],
+    link_with: [
+      libvirt_lib,
+      libvirt_lxc_lib,
+    ],
+    install: true,
+    install_dir: libexecdir,
+    install_rpath: libdir,
+  )
 endif