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

meson: src: build virtvboxd 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/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am
index e61c3df40d..fc71301e59 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 5af671c00c..0619834a9c 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