[libvirt PATCH 210/351] meson: src: build virtsecretd daemon binary

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:57:26 UTC 2020


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 src/secret/Makefile.inc.am | 12 ------------
 src/secret/meson.build     |  8 ++++++++
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am
index e47aa678a6c..7a03f6728ee 100644
--- a/src/secret/Makefile.inc.am
+++ b/src/secret/Makefile.inc.am
@@ -5,22 +5,10 @@ STATEFUL_DRIVER_SOURCE_FILES += \
 	$(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES))
 
 if WITH_SECRETS
-sbin_PROGRAMS += virtsecretd
-
 nodist_conf_DATA += secret/virtsecretd.conf
 augeas_DATA += secret/virtsecretd.aug
 augeastest_DATA += secret/test_virtsecretd.aug
 
-virtsecretd_SOURCES = $(REMOTE_DAEMON_SOURCES)
-nodist_virtsecretd_SOURCES = $(REMOTE_DAEMON_GENERATED)
-virtsecretd_CFLAGS = \
-	$(REMOTE_DAEMON_CFLAGS) \
-	-DDAEMON_NAME="\"virtsecretd\"" \
-	-DMODULE_NAME="\"secret\"" \
-	$(NULL)
-virtsecretd_LDFLAGS = $(REMOTE_DAEMON_LD_FLAGS)
-virtsecretd_LDADD = $(REMOTE_DAEMON_LD_ADD)
-
 SYSCONF_FILES += secret/virtsecretd.sysconf
 
 SYSTEMD_UNIT_FILES += \
diff --git a/src/secret/meson.build b/src/secret/meson.build
index a6d0a321938..43f1d7342d5 100644
--- a/src/secret/meson.build
+++ b/src/secret/meson.build
@@ -15,4 +15,12 @@ if conf.has('WITH_SECRETS')
       libvirt_no_undefined,
     ],
   }
+
+  virt_daemons += {
+    'name': 'virtsecretd',
+    'c_args': [
+      '-DDAEMON_NAME="virtsecretd"',
+      '-DMODULE_NAME="secret"',
+    ],
+  }
 endif
-- 
2.26.2




More information about the libvir-list mailing list