meson: src: build virtvzd 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/Makefile.am b/src/Makefile.am
index d3a0bb2666069d139db91a8007c1957f2f54cf55..88e9d327c79c5e5c8f2db80a825843e28fc602fe 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,7 +44,6 @@ OPENRC_INIT_FILES =
 OPENRC_INIT_FILES_IN =
 OPENRC_CONF_FILES =
 SYSCONF_FILES =
-sbin_PROGRAMS =
 bin_PROGRAMS =
 
 COMMON_UNIT_VARS = \

diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am
index f55d03d400a5c9f3bbbc036661ef5fe3435c8fab..18bb0c40c46eb035d3f18ca1807a66947f17b558 100644 (file)
--- a/src/vz/Makefile.inc.am
+++ b/src/vz/Makefile.inc.am
@@ -5,22 +5,10 @@ STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES))
 
 
 if WITH_VZ
-sbin_PROGRAMS += virtvzd
-
 nodist_conf_DATA += vz/virtvzd.conf
 augeas_DATA += vz/virtvzd.aug
 augeastest_DATA += vz/test_virtvzd.aug
 
-virtvzd_SOURCES = $(REMOTE_DAEMON_SOURCES)
-nodist_virtvzd_SOURCES = $(REMOTE_DAEMON_GENERATED)
-virtvzd_CFLAGS = \
-       $(REMOTE_DAEMON_CFLAGS) \
-       -DDAEMON_NAME="\"virtvzd\"" \
-       -DMODULE_NAME="\"vz\"" \
-       $(NULL)
-virtvzd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
-virtvzd_LDADD = $(REMOTE_DAEMON_LD_ADD)
-
 SYSCONF_FILES += vz/virtvzd.sysconf
 
 SYSTEMD_UNIT_FILES += \

diff --git a/src/vz/meson.build b/src/vz/meson.build
index 41cce92de2f5892df70b22e9987f242bb1563d14..07ad8fc75aea840e41cc4d154993f38105d3018f 100644 (file)
--- a/src/vz/meson.build
+++ b/src/vz/meson.build
@@ -30,4 +30,12 @@ if conf.has('WITH_VZ')
       libvirt_no_undefined,
     ],
   }
+
+  virt_daemons += {
+    'name': 'virtvzd',
+    'c_args': [
+      '-DDAEMON_NAME="virtvzd"',
+      '-DMODULE_NAME="vz"',
+    ],
+  }
 endif