[libvirt PATCH 205/351] meson: src: build virtnodedevd daemon binary
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/node_device/Makefile.inc.am | 12 ------------
src/node_device/meson.build | 8 ++++++++
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
index d7d80f61fbb..731d513c980 100644
--- a/src/node_device/Makefile.inc.am
+++ b/src/node_device/Makefile.inc.am
@@ -12,22 +12,10 @@ STATEFUL_DRIVER_SOURCE_FILES += \
if WITH_NODE_DEVICES
-sbin_PROGRAMS += virtnodedevd
-
nodist_conf_DATA += node_device/virtnodedevd.conf
augeas_DATA += node_device/virtnodedevd.aug
augeastest_DATA += node_device/test_virtnodedevd.aug
-virtnodedevd_SOURCES = $(REMOTE_DAEMON_SOURCES)
-nodist_virtnodedevd_SOURCES = $(REMOTE_DAEMON_GENERATED)
-virtnodedevd_CFLAGS = \
- $(REMOTE_DAEMON_CFLAGS) \
- -DDAEMON_NAME="\"virtnodedevd\"" \
- -DMODULE_NAME="\"nodedev\"" \
- $(NULL)
-virtnodedevd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
-virtnodedevd_LDADD = $(REMOTE_DAEMON_LD_ADD)
-
SYSCONF_FILES += node_device/virtnodedevd.sysconf
SYSTEMD_UNIT_FILES += \
diff --git a/src/node_device/meson.build b/src/node_device/meson.build
index 00fa7e0ea9c..f85320cf85a 100644
--- a/src/node_device/meson.build
+++ b/src/node_device/meson.build
@@ -38,4 +38,12 @@ if conf.has('WITH_NODE_DEVICES')
libvirt_no_undefined,
],
}
+
+ virt_daemons += {
+ 'name': 'virtnodedevd',
+ 'c_args': [
+ '-DDAEMON_NAME="virtnodedevd"',
+ '-DMODULE_NAME="nodedev"',
+ ],
+ }
endif
--
2.26.2