Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
src/network/Makefile.inc.am | 22 ----------------------
src/network/meson.build | 12 ++++++++++++
2 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index c0c8180674d..fe93adc0194 100644
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -1,14 +1,9 @@
# vim: filetype=automake
-NETWORK_LEASES_HELPER_SOURCES = \
- network/leaseshelper.c \
- $(NULL)
-
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(NETWORK_DRIVER_SOURCES))
-
if WITH_NETWORK
nodist_conf_DATA += network/virtnetworkd.conf
augeas_DATA += network/virtnetworkd.aug
@@ -74,23 +69,6 @@ network/test_virtnetworkd.aug: remote/test_libvirtd.aug.in \
-e 's/[@]DAEMON_NAME_UC[@]/Virtnetworkd/' \
> $@ || rm -f $@
-libexec_PROGRAMS += libvirt_leaseshelper
-libvirt_leaseshelper_SOURCES = $(NETWORK_LEASES_HELPER_SOURCES)
-libvirt_leaseshelper_LDFLAGS = \
- $(AM_LDFLAGS) \
- $(NULL)
-libvirt_leaseshelper_LDADD = \
- libvirt.la \
- $(GLIB_LIBS) \
- $(NULL)
-if WITH_DTRACE_PROBES
-libvirt_leaseshelper_LDADD += libvirt_probes.lo
-endif WITH_DTRACE_PROBES
-
-libvirt_leaseshelper_CFLAGS = \
- $(AM_CFLAGS) \
- $(NULL)
-
INSTALL_DATA_DIRS += network
UUID=$(shell uuidgen 2>/dev/null)
diff --git a/src/network/meson.build b/src/network/meson.build
index d244d2f522b..9b59e442c9d 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -3,6 +3,10 @@ network_driver_sources = [
'bridge_driver_platform.c',
]
+network_leases_helper_sources = files(
+ 'leaseshelper.c',
+)
+
if conf.has('WITH_NETWORK')
network_driver_impl = static_library(
'virt_driver_network_impl',
@@ -41,4 +45,12 @@ if conf.has('WITH_NETWORK')
'-DMODULE_NAME="network"',
],
}
+
+ virt_helpers += {
+ 'name': 'libvirt_leaseshelper',
+ 'sources': [
+ network_leases_helper_sources,
+ dtrace_gen_objects,
+ ],
+ }
endif
--
2.26.2
