Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
src/Makefile.am | 24 ------------------------
src/util/Makefile.inc.am | 3 ---
src/util/meson.build | 14 ++++++++++++++
3 files changed, 14 insertions(+), 27 deletions(-)
delete mode 100644 src/util/Makefile.inc.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 8760fdf3a22..99bb71e6a03 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,6 @@ conf_DATA =
if WITH_DTRACE_PROBES
tapset_DATA =
endif WITH_DTRACE_PROBES
-libexec_PROGRAMS =
RPC_PROBE_FILES =
LOGROTATE_FILES_IN =
SYSTEMD_UNIT_FILES =
@@ -50,7 +49,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
@@ -336,28 +334,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
-
-
install-data-local: $(INSTALL_DATA_LOCAL) \
$(INSTALL_DATA_DIRS:%=install-data-%)
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt"
diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am
deleted file mode 100644
index 879b3d9e398..00000000000
--- 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 3c728b355ee..af60283cbc7 100644
--- 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('.')
--
2.26.2
