[libvirt PATCH 193/351] meson: src: build libvirt_storage_*_gluster.so shared modules

[Pavel Hrdina]

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

diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index ebb700eb160..041a9e12122 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -1,15 +1,5 @@
 # vim: filetype=automake
 
-STORAGE_DRIVER_GLUSTER_SOURCES = \
-	storage/storage_backend_gluster.h \
-	storage/storage_backend_gluster.c \
-	$(NULL)
-
-STORAGE_FILE_GLUSTER_SOURCES = \
-	storage/storage_file_gluster.h \
-	storage/storage_file_gluster.c \
-	$(NULL)
-
 STORAGE_DRIVER_ZFS_SOURCES = \
 	storage/storage_backend_zfs.h \
 	storage/storage_backend_zfs.c \
@@ -30,8 +20,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
 
 storagebackend_LTLIBRARIES =
 
-storagefile_LTLIBRARIES =
-
 if WITH_STORAGE
 sbin_PROGRAMS += virtstoraged
 
@@ -112,41 +100,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \
 
 endif WITH_STORAGE
 
-if WITH_STORAGE_GLUSTER
-libvirt_storage_backend_gluster_la_SOURCES = \
-	$(STORAGE_DRIVER_GLUSTER_SOURCES)
-libvirt_storage_backend_gluster_la_LIBADD = \
-	libvirt.la \
-	$(GLUSTERFS_LIBS) \
-	$(GLIB_LIBS) \
-	$(NULL)
-libvirt_storage_backend_gluster_la_CFLAGS = \
-	-I$(srcdir)/conf \
-	$(GLUSTERFS_CFLAGS) \
-	$(AM_CFLAGS) \
-	$(NULL)
-
-storagebackend_LTLIBRARIES += libvirt_storage_backend_gluster.la
-libvirt_storage_backend_gluster_la_LDFLAGS = $(AM_LDFLAGS_MOD)
-
-
-libvirt_storage_file_gluster_la_SOURCES = \
-	$(STORAGE_FILE_GLUSTER_SOURCES)
-libvirt_storage_file_gluster_la_LIBADD = \
-	libvirt.la \
-	$(GLUSTERFS_LIBS) \
-	$(GLIB_LIBS) \
-	$(NULL)
-libvirt_storage_file_gluster_la_CFLAGS = \
-	-I$(srcdir)/conf \
-	$(GLUSTERFS_CFLAGS) \
-	$(AM_CFLAGS) \
-	$(NULL)
-
-storagefile_LTLIBRARIES += libvirt_storage_file_gluster.la
-libvirt_storage_file_gluster_la_LDFLAGS = $(AM_LDFLAGS_MOD)
-endif WITH_STORAGE_GLUSTER
-
 if WITH_STORAGE_ZFS
 libvirt_storage_backend_zfs_la_SOURCES = \
 	$(STORAGE_DRIVER_ZFS_SOURCES)
diff --git a/src/storage/meson.build b/src/storage/meson.build
index ae36f3e829e..c97a1b86eff 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -20,6 +20,14 @@ storage_backend_disk_sources = [
   'storage_backend_disk.c',
 ]
 
+storage_backend_gluster_sources = [
+  'storage_backend_gluster.c',
+]
+
+storage_file_gluster_sources = [
+  'storage_file_gluster.c',
+]
+
 storage_backend_iscsi_sources = [
   'storage_backend_iscsi.c',
 ]
@@ -105,6 +113,30 @@ if conf.has('WITH_STORAGE_DISK')
   }
 endif
 
+if conf.has('WITH_STORAGE_GLUSTER')
+  virt_modules += {
+    'name': 'virt_storage_backend_gluster',
+    'sources': [
+      files(storage_backend_gluster_sources),
+    ],
+    'deps': [
+      glusterfs_dep,
+    ],
+    'install_dir': storage_backend_install_dir,
+  }
+
+  virt_modules += {
+    'name': 'virt_storage_file_gluster',
+    'sources': [
+      files(storage_file_gluster_sources),
+    ],
+    'dependenciec': [
+      glusterfs_dep,
+    ],
+    'install_dir': storage_file_install_dir,
+  }
+endif
+
 if conf.has('WITH_STORAGE_ISCSI')
   virt_modules += {
     'name': 'virt_storage_backend_iscsi',
-- 
2.26.2