]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
meson: src: build virtsecretd daemon binary
authorPavel Hrdina <phrdina@redhat.com>
Mon, 22 Jun 2020 14:55:12 +0000 (16:55 +0200)
committerPavel Hrdina <phrdina@redhat.com>
Mon, 3 Aug 2020 07:27:05 +0000 (09:27 +0200)
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
src/secret/Makefile.inc.am
src/secret/meson.build

index e47aa678a6caa3746dc9d424dbc7650d5c6b6398..7a03f6728ee519f270128d8f9147efedf55ab9a9 100644 (file)
@@ -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 += \
index a6d0a32193809089f76396e0d6be4a5c29f9d60b..43f1d7342d5f44a70c13390c3094f3044739f47e 100644 (file)
@@ -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