[libvirt PATCH 200/351] meson: src: build virtxend daemon binary

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:57:16 UTC 2020


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 src/libxl/Makefile.inc.am | 11 -----------
 src/libxl/meson.build     |  8 ++++++++
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 35e6b3bbcd9..051b6c55bd9 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 484f3805851..fc5864a090c 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
-- 
2.26.2




More information about the libvir-list mailing list