[libvirt PATCH 207/351] meson: src: build virtqemud daemon binary

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


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

diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index f2b5e3a77f6..129825121c7 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -4,22 +4,10 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(QEMU_DRIVER_SOURCES))
 
 if WITH_QEMU
-sbin_PROGRAMS += virtqemud
-
 nodist_conf_DATA += qemu/virtqemud.conf
 augeas_DATA += qemu/virtqemud.aug
 augeastest_DATA += qemu/test_virtqemud.aug
 
-virtqemud_SOURCES = $(REMOTE_DAEMON_SOURCES)
-nodist_virtqemud_SOURCES = $(REMOTE_DAEMON_GENERATED)
-virtqemud_CFLAGS = \
-       $(REMOTE_DAEMON_CFLAGS) \
-       -DDAEMON_NAME="\"virtqemud\"" \
-       -DMODULE_NAME="\"qemu\"" \
-       $(NULL)
-virtqemud_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
-virtqemud_LDADD = $(REMOTE_DAEMON_LD_ADD)
-
 SYSCONF_FILES += qemu/virtqemud.sysconf
 
 SYSTEMD_UNIT_FILES += \
diff --git a/src/qemu/meson.build b/src/qemu/meson.build
index 209cb5f4956..121be3085fa 100644
--- a/src/qemu/meson.build
+++ b/src/qemu/meson.build
@@ -105,4 +105,12 @@ if conf.has('WITH_QEMU')
       libvirt_no_undefined,
     ],
   }
+
+  virt_daemons += {
+    'name': 'virtqemud',
+    'c_args': [
+      '-DDAEMON_NAME="virtqemud"',
+      '-DMODULE_NAME="qemu"',
+    ],
+  }
 endif
-- 
2.26.2




More information about the libvir-list mailing list