From: Pavel Hrdina <phrdina@redhat.com>
Date: Wed, 22 Apr 2020 09:55:08 +0000 (+0200)
Subject: meson: src: build virtstoraged daemon binary
X-Git-Tag: v6.7.0-rc1~392
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f6bbee89bcf321236e7e47dc640a4525d1f0108;p=thirdparty%2Flibvirt.git

meson: src: build virtstoraged 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/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index 45cbe476d2..e30f82e14f 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -9,22 +9,10 @@ STATEFUL_DRIVER_SOURCE_FILES += \
 	$(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES))
 
 if WITH_STORAGE
-sbin_PROGRAMS += virtstoraged
-
 nodist_conf_DATA += storage/virtstoraged.conf
 augeas_DATA += storage/virtstoraged.aug
 augeastest_DATA += storage/test_virtstoraged.aug
 
-virtstoraged_SOURCES = $(REMOTE_DAEMON_SOURCES)
-nodist_virtstoraged_SOURCES = $(REMOTE_DAEMON_GENERATED)
-virtstoraged_CFLAGS = \
-       $(REMOTE_DAEMON_CFLAGS) \
-       -DDAEMON_NAME="\"virtstoraged\"" \
-       -DMODULE_NAME="\"storage\"" \
-       $(NULL)
-virtstoraged_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
-virtstoraged_LDADD = $(REMOTE_DAEMON_LD_ADD)
-
 SYSCONF_FILES += storage/virtstoraged.sysconf
 
 SYSTEMD_UNIT_FILES += \
diff --git a/src/storage/meson.build b/src/storage/meson.build
index baf5ae5b2f..a18da013f8 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -109,6 +109,14 @@ if conf.has('WITH_STORAGE')
     ],
     'install_dir': storage_file_install_dir,
   }
+
+  virt_daemons += {
+    'name': 'virtstoraged',
+    'c_args': [
+      '-DDAEMON_NAME="virtstoraged"',
+      '-DMODULE_NAME="storage"',
+    ],
+  }
 endif
 
 if conf.has('WITH_STORAGE_DISK')