[libvirt PATCH 195/351] meson: src: build libvirt_storage_backend_vstorage.so shared module

[Pavel Hrdina]

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

diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index 94a471eb0c0..45cbe476d22 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -1,10 +1,5 @@
 # vim: filetype=automake
 
-STORAGE_DRIVER_VSTORAGE_SOURCES = \
-	storage/storage_backend_vstorage.h \
-	storage/storage_backend_vstorage.c \
-	$(NULL)
-
 STORAGE_HELPER_DISK_SOURCES = \
 	storage/parthelper.c \
 	$(NULL)
@@ -13,8 +8,6 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES))
 STATEFUL_DRIVER_SOURCE_FILES += \
 	$(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES))
 
-storagebackend_LTLIBRARIES =
-
 if WITH_STORAGE
 sbin_PROGRAMS += virtstoraged
 
@@ -95,22 +88,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \
 
 endif WITH_STORAGE
 
-if WITH_STORAGE_VSTORAGE
-libvirt_storage_backend_vstorage_la_SOURCES = \
-	$(STORAGE_DRIVER_VSTORAGE_SOURCES)
-libvirt_storage_backend_vstorage_la_CFLAGS = \
-	-I$(srcdir)/conf \
-	$(AM_CFLAGS) \
-	$(NULL)
-
-storagebackend_LTLIBRARIES += libvirt_storage_backend_vstorage.la
-libvirt_storage_backend_vstorage_la_LDFLAGS = $(AM_LDFLAGS_MOD)
-libvirt_storage_backend_vstorage_la_LIBADD = \
-	libvirt.la \
-	$(GLIB_LIBS) \
-	$(NULL)
-endif WITH_STORAGE_VSTORAGE
-
 if WITH_STORAGE_DISK
 libexec_PROGRAMS += libvirt_parthelper
 
diff --git a/src/storage/meson.build b/src/storage/meson.build
index 4450f1908f3..baf5ae5b2fe 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -56,6 +56,10 @@ storage_backend_sheepdog_sources = [
   'storage_backend_sheepdog.c',
 ]
 
+storage_backend_vstorage_sources = [
+  'storage_backend_vstorage.c',
+]
+
 storage_backend_zfs_sources = [
   'storage_backend_zfs.c',
 ]
@@ -231,6 +235,16 @@ if conf.has('WITH_STORAGE_SHEEPDOG')
   }
 endif
 
+if conf.has('WITH_STORAGE_VSTORAGE')
+  virt_modules += {
+    'name': 'virt_storage_backend_vstorage',
+    'sources': [
+      files(storage_backend_vstorage_sources),
+    ],
+    'install_dir': storage_backend_install_dir,
+  }
+endif
+
 if conf.has('WITH_STORAGE_ZFS')
   virt_modules += {
     'name': 'virt_storage_backend_zfs',
-- 
2.26.2