[libvirt PATCH 212/351] meson: src: build virtvboxd daemon binary
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/vbox/Makefile.inc.am | 12 ------------
src/vbox/meson.build | 8 ++++++++
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am
index e61c3df40d6..fc71301e595 100644
--- a/src/vbox/Makefile.inc.am
+++ b/src/vbox/Makefile.inc.am
@@ -6,22 +6,10 @@ DRIVER_SOURCE_FILES += \
$(NULL)
if WITH_VBOX
-sbin_PROGRAMS += virtvboxd
-
nodist_conf_DATA += vbox/virtvboxd.conf
augeas_DATA += vbox/virtvboxd.aug
augeastest_DATA += vbox/test_virtvboxd.aug
-virtvboxd_SOURCES = $(REMOTE_DAEMON_SOURCES)
-nodist_virtvboxd_SOURCES = $(REMOTE_DAEMON_GENERATED)
-virtvboxd_CFLAGS = \
- $(REMOTE_DAEMON_CFLAGS) \
- -DDAEMON_NAME="\"virtvboxd\"" \
- -DMODULE_NAME="\"vbox\"" \
- $(NULL)
-virtvboxd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
-virtvboxd_LDADD = $(REMOTE_DAEMON_LD_ADD)
-
SYSCONF_FILES += vbox/virtvboxd.sysconf
SYSTEMD_UNIT_FILES += \
diff --git a/src/vbox/meson.build b/src/vbox/meson.build
index 5af671c00cb..0619834a9c8 100644
--- a/src/vbox/meson.build
+++ b/src/vbox/meson.build
@@ -38,4 +38,12 @@ if conf.has('WITH_VBOX')
libvirt_no_undefined,
],
}
+
+ virt_daemons += {
+ 'name': 'virtvboxd',
+ 'c_args': [
+ '-DDAEMON_NAME="virtvboxd"',
+ '-DMODULE_NAME="vbox"',
+ ],
+ }
endif
--
2.26.2