meson: src: build virtbhyved 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/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index 40384e1c7149f6c30761f9c4a820f2a544ae2afa..ab681685b2bf526a6e5447f291dc1e1f74032bdb 100644 (file)
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -4,22 +4,10 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(BHYVE_DRIVER_SOURCES))
 
 if WITH_BHYVE
-sbin_PROGRAMS += virtbhyved
-
 nodist_conf_DATA += bhyve/virtbhyved.conf
 augeas_DATA += bhyve/virtbhyved.aug
 augeastest_DATA += bhyve/test_virtbhyved.aug
 
-virtbhyved_SOURCES = $(REMOTE_DAEMON_SOURCES)
-nodist_virtbhyved_SOURCES = $(REMOTE_DAEMON_GENERATED)
-virtbhyved_CFLAGS = \
-       $(REMOTE_DAEMON_CFLAGS) \
-       -DDAEMON_NAME="\"virtbhyved\"" \
-       -DMODULE_NAME="\"bhyve\"" \
-       $(NULL)
-virtbhyved_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
-virtbhyved_LDADD = $(REMOTE_DAEMON_LD_ADD)
-
 bhyve/virtbhyved.conf: remote/libvirtd.conf.in
        $(AM_V_GEN)$(SED) \
                -e '/[@]CUT_ENABLE_IP[@]/,/[@]END[@]/d' \

diff --git a/src/bhyve/meson.build b/src/bhyve/meson.build
index 83d8c366635250b526428b78a341bdc5464d432c..5807d67591adfffd77f405b76fed7c72b68e79dc 100644 (file)
--- a/src/bhyve/meson.build
+++ b/src/bhyve/meson.build
@@ -35,4 +35,12 @@ if conf.has('WITH_BHYVE')
       libvirt_no_undefined,
     ],
   }
+
+  virt_daemons += {
+    'name': 'virtbhyved',
+    'c_args': [
+      '-DDAEMON_NAME="virtbhyved"',
+      '-DMODULE_NAME="bhyve"'
+    ],
+  }
 endif