From 7dd9e54d3562cb5d00134368cc286231aab53d83 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 22 Jun 2020 16:49:50 +0200 Subject: [PATCH] meson: src: build virtqemud daemon binary Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- 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 f2b5e3a77f..129825121c 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 a98f57f0f8..0ac9c045ca 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -109,4 +109,12 @@ if conf.has('WITH_QEMU') libvirt_no_undefined, ], } + + virt_daemons += { + 'name': 'virtqemud', + 'c_args': [ + '-DDAEMON_NAME="virtqemud"', + '-DMODULE_NAME="qemu"', + ], + } endif -- 2.47.2