meson: src: build virt-qemu-run binary

-export-dynamic is provided by src_dep

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/src/Makefile.am b/src/Makefile.am
index 88e9d327c79c5e5c8f2db80a825843e28fc602fe..c8dc0ca73862dc54f8f740e105065f81e99388b8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,7 +44,6 @@ OPENRC_INIT_FILES =
 OPENRC_INIT_FILES_IN =
 OPENRC_CONF_FILES =
 SYSCONF_FILES =
-bin_PROGRAMS =
 
 COMMON_UNIT_VARS = \
        -e 's|[@]runstatedir[@]|$(runstatedir)|g' \

diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 129825121c7184cb708c7fe72f41f0bb6ba47a92..80555d79a409ee1cb277826f2515138664a3705b 100644 (file)
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -101,17 +101,3 @@ endif WITH_QEMU
        install-data-qemu \
        uninstall-data-qemu \
        $(NULL)
-
-QEMU_SHIM_SOURCES = qemu/qemu_shim.c
-
-if WITH_QEMU
-bin_PROGRAMS += virt-qemu-run
-
-virt_qemu_run_SOURCES = $(QEMU_SHIM_SOURCES)
-
-virt_qemu_run_LDADD = \
-       libvirt.la \
-       $(GLIB_LIBS) \
-       $(NULL)
-virt_qemu_run_LDFLAGS = -export-dynamic
-endif WITH_QEMU

diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 0ac9c045ca90a6f5dea788a20e8f561a4f0ca780..e18274f0c03ec0af2315ddc808f71365d9938af2 100644 (file)
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -74,6 +74,10 @@ if conf.has('WITH_DTRACE_PROBES')
   )
 endif
 
+qemu_shim_sources = files(
+  'qemu_shim.c',
+)
+
 if conf.has('WITH_QEMU')
   qemu_driver_impl = static_library(
     'virt_driver_qemu_impl',
@@ -117,4 +121,12 @@ if conf.has('WITH_QEMU')
       '-DMODULE_NAME="qemu"',
     ],
   }
+
+  virt_helpers += {
+    'name': 'virt-qemu-run',
+    'sources': [
+      qemu_shim_sources
+    ],
+    'install_dir': bindir,
+  }
 endif