From b30483f1d9c77ded9a419b21cb9124b7ab3a48bd Mon Sep 17 00:00:00 2001
From: Pavel Hrdina <phrdina@redhat.com>
Date: Thu, 18 Jun 2020 01:14:10 +0200
Subject: [PATCH] meson: src: build libvirt_driver_secret.so shared module

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
---
 src/meson.build            |  1 +
 src/secret/Makefile.inc.am | 21 ---------------------
 src/secret/meson.build     | 18 ++++++++++++++++++
 3 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 src/secret/meson.build

diff --git a/src/meson.build b/src/meson.build
index 900060cfa9..77496addb8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -169,6 +169,7 @@ subdir('logging')
 subdir('network')
 subdir('node_device')
 subdir('nwfilter')
+subdir('secret')
 subdir('security')
 subdir('storage')
 
diff --git a/src/secret/Makefile.inc.am b/src/secret/Makefile.inc.am
index 586e6e372f..e47aa678a6 100644
--- a/src/secret/Makefile.inc.am
+++ b/src/secret/Makefile.inc.am
@@ -1,31 +1,10 @@
 # vim: filetype=automake
 
-SECRET_DRIVER_SOURCES = \
-	secret/secret_driver.h \
-	secret/secret_driver.c \
-	$(NULL)
-
-
 DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += \
 	$(addprefix $(srcdir)/,$(SECRET_DRIVER_SOURCES))
 
-
 if WITH_SECRETS
-mod_LTLIBRARIES += libvirt_driver_secret.la
-libvirt_driver_secret_la_CFLAGS = \
-	-I$(srcdir)/access \
-	-I$(builddir)/access \
-	-I$(srcdir)/conf \
-	$(AM_CFLAGS) \
-	$(NULL)
-libvirt_driver_secret_la_LIBADD = \
-	libvirt.la \
-	$(GLIB_LIBS) \
-	$(NULL)
-libvirt_driver_secret_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES)
-
 sbin_PROGRAMS += virtsecretd
 
 nodist_conf_DATA += secret/virtsecretd.conf
diff --git a/src/secret/meson.build b/src/secret/meson.build
new file mode 100644
index 0000000000..a6d0a32193
--- /dev/null
+++ b/src/secret/meson.build
@@ -0,0 +1,18 @@
+secret_driver_sources = [
+  'secret_driver.c',
+]
+
+if conf.has('WITH_SECRETS')
+  virt_modules += {
+    'name': 'virt_driver_secret',
+    'sources': [
+      files(secret_driver_sources),
+    ],
+    'deps': [
+      access_dep,
+    ],
+    'link_args': [
+      libvirt_no_undefined,
+    ],
+  }
+endif