From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 22 Jun 2020 14:36:17 +0000 (+0200)
Subject: meson: src: build virtxend daemon binary
X-Git-Tag: v6.7.0-rc1~403
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d2b17a54c1b390b02fb6d774b453de6f472eeb7;p=thirdparty%2Flibvirt.git

meson: src: build virtxend daemon 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/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 35e6b3bbcd..051b6c55bd 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -4,22 +4,11 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES))
 
 if WITH_LIBXL
-sbin_PROGRAMS += virtxend
 
 nodist_conf_DATA += libxl/virtxend.conf
 augeas_DATA += libxl/virtxend.aug
 augeastest_DATA += libxl/test_virtxend.aug
 
-virtxend_SOURCES = $(REMOTE_DAEMON_SOURCES)
-nodist_virtxend_SOURCES = $(REMOTE_DAEMON_GENERATED)
-virtxend_CFLAGS = \
-       $(REMOTE_DAEMON_CFLAGS) \
-       -DDAEMON_NAME="\"virtxend\"" \
-       -DMODULE_NAME="\"libxl\"" \
-       $(NULL)
-virtxend_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
-virtxend_LDADD = $(REMOTE_DAEMON_LD_ADD)
-
 SYSCONF_FILES += libxl/virtxend.sysconf
 
 SYSTEMD_UNIT_FILES += \
diff --git a/src/libxl/meson.build b/src/libxl/meson.build
index 484f380585..fc5864a090 100644
--- a/src/libxl/meson.build
+++ b/src/libxl/meson.build
@@ -36,4 +36,12 @@ if conf.has('WITH_LIBXL')
       libvirt_no_undefined,
     ],
   }
+
+  virt_daemons += {
+    'name': 'virtxend',
+    'c_args': [
+      '-DDAEMON_NAME="virtxend"',
+      '-DMODULE_NAME="libxl"',
+    ],
+  }
 endif