[libvirt PATCH 211/351] meson: src: build virtstoraged daemon binary
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/storage/Makefile.inc.am | 12 ------------
src/storage/meson.build | 8 ++++++++
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index 45cbe476d22..e30f82e14fe 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 baf5ae5b2fe..a18da013f8c 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')
--
2.26.2