Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
src/storage/Makefile.inc.am | 21 ---------------------
src/storage/meson.build | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index 4c60bc7bd2f..b52a9e79e63 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -1,10 +1,5 @@
# vim: filetype=automake
-STORAGE_DRIVER_RBD_SOURCES = \
- storage/storage_backend_rbd.h \
- storage/storage_backend_rbd.c \
- $(NULL)
-
STORAGE_DRIVER_SHEEPDOG_SOURCES = \
storage/storage_backend_sheepdog.h \
storage/storage_backend_sheepdog.c \
@@ -123,22 +118,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \
endif WITH_STORAGE
-if WITH_STORAGE_RBD
-libvirt_storage_backend_rbd_la_SOURCES = $(STORAGE_DRIVER_RBD_SOURCES)
-libvirt_storage_backend_rbd_la_LIBADD = \
- libvirt.la \
- $(LIBRBD_LIBS) \
- $(GLIB_LIBS) \
- $(NULL)
-libvirt_storage_backend_rbd_la_CFLAGS = \
- -I$(srcdir)/conf \
- $(AM_CFLAGS) \
- $(NULL)
-
-storagebackend_LTLIBRARIES += libvirt_storage_backend_rbd.la
-libvirt_storage_backend_rbd_la_LDFLAGS = $(AM_LDFLAGS_MOD)
-endif WITH_STORAGE_RBD
-
if WITH_STORAGE_SHEEPDOG
libvirt_storage_backend_sheepdog_la_SOURCES = \
$(STORAGE_DRIVER_SHEEPDOG_SOURCES)
diff --git a/src/storage/meson.build b/src/storage/meson.build
index 8087bd45648..3663b530d69 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -36,6 +36,10 @@ storage_backend_mpath_sources = [
'storage_backend_mpath.c',
]
+storage_backend_rbd_sources = [
+ 'storage_backend_rbd.c',
+]
+
storage_backend_scsi_sources = [
'storage_backend_scsi.c',
]
@@ -143,6 +147,19 @@ if conf.has('WITH_STORAGE_MPATH')
}
endif
+if conf.has('WITH_STORAGE_RBD')
+ virt_modules += {
+ 'name': 'virt_storage_backend_rbd',
+ 'sources': [
+ files(storage_backend_rbd_sources),
+ ],
+ 'deps': [
+ rbd_dep
+ ],
+ 'install_dir': storage_backend_install_dir,
+ }
+endif
+
if conf.has('WITH_STORAGE_SCSI')
virt_modules += {
'name': 'virt_storage_backend_scsi',
--
2.26.2
