meson: src: build libvirt_iohelper 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/src/Makefile.am b/src/Makefile.am
index c8dc0ca73862dc54f8f740e105065f81e99388b8..ac799296a281786c3e43e155eebe07ef8cae9ea3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,7 +35,6 @@ conf_DATA =
 if WITH_DTRACE_PROBES
 tapset_DATA =
 endif WITH_DTRACE_PROBES
-libexec_PROGRAMS =
 RPC_PROBE_FILES =
 LOGROTATE_FILES_IN =
 SYSTEMD_UNIT_FILES =
@@ -51,7 +50,6 @@ COMMON_UNIT_VARS = \
        -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
        $(NULL)
 
-include util/Makefile.inc.am
 include security/Makefile.inc.am
 include access/Makefile.inc.am
 include logging/Makefile.inc.am
@@ -347,28 +345,6 @@ endif LIBVIRT_INIT_SCRIPT_OPENRC
 endif WITH_LIBVIRTD
 
 
-if WITH_LIBVIRTD
-libexec_PROGRAMS += libvirt_iohelper
-libvirt_iohelper_SOURCES = $(UTIL_IO_HELPER_SOURCES)
-libvirt_iohelper_LDFLAGS = \
-               $(AM_LDFLAGS) \
-               $(NULL)
-libvirt_iohelper_LDADD = \
-               libvirt.la \
-               $(GLIB_LIBS) \
-               $(NULL)
-if WITH_DTRACE_PROBES
-libvirt_iohelper_LDADD += libvirt_probes.lo
-endif WITH_DTRACE_PROBES
-
-libvirt_iohelper_CFLAGS = \
-               $(AM_CFLAGS) \
-               $(NULL)
-
-
-endif WITH_LIBVIRTD
-
-
 generated-sources: $(BUILT_SOURCES)
 
 

diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am
deleted file mode 100644 (file)
index 879b3d9..0000000
--- a/src/util/Makefile.inc.am
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim: filetype=automake
-
-UTIL_IO_HELPER_SOURCES = util/iohelper.c

diff --git a/src/util/meson.build b/src/util/meson.build
index e6dd037f84878cdcd35d48c2b96f62bc26f1d5bf..a7017f459f666fe30d50e2c78270ee8e3f15d88a 100644 (file)
--- a/src/util/meson.build
+++ b/src/util/meson.build
@@ -168,6 +168,10 @@ foreach name : keyname_list
   )
 endforeach
 
+io_helper_sources = [
+  'iohelper.c',
+]
+
 virt_util_lib = static_library(
   'virt_util',
   [
@@ -195,4 +199,14 @@ virt_util_lib = static_library(
 
 libvirt_libs += virt_util_lib
 
+if conf.has('WITH_LIBVIRTD')
+  virt_helpers += {
+    'name': 'libvirt_iohelper',
+    'sources': [
+      files(io_helper_sources),
+      dtrace_gen_headers,
+    ],
+  }
+endif
+
 util_inc_dir = include_directories('.')