From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 24 Jun 2020 11:30:51 +0000 (+0200)
Subject: meson: src: build libvirt_leaseshelper binary
X-Git-Tag: v6.7.0-rc1~386
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dab71cfe98d94b16cae8b94586815c0cc0f25e23;p=thirdparty%2Flibvirt.git

meson: src: build libvirt_leaseshelper 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/network/Makefile.inc.am b/src/network/Makefile.inc.am
index c0c8180674..fe93adc019 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 d244d2f522..9b59e442c9 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