[libvirt PATCH 190/351] meson: src: build libvirt_storage_backend_disk.so shared module
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/storage/Makefile.inc.am | 20 --------------------
src/storage/meson.build | 14 ++++++++++++++
2 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index cc2d1743f83..4c60bc7bd2f 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -1,10 +1,5 @@
# vim: filetype=automake
-STORAGE_DRIVER_DISK_SOURCES = \
- storage/storage_backend_disk.h \
- storage/storage_backend_disk.c \
- $(NULL)
-
STORAGE_DRIVER_RBD_SOURCES = \
storage/storage_backend_rbd.h \
storage/storage_backend_rbd.c \
@@ -128,21 +123,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \
endif WITH_STORAGE
-if WITH_STORAGE_DISK
-libvirt_storage_backend_disk_la_SOURCES = $(STORAGE_DRIVER_DISK_SOURCES)
-libvirt_storage_backend_disk_la_CFLAGS = \
- -I$(srcdir)/conf \
- $(AM_CFLAGS) \
- $(NULL)
-
-storagebackend_LTLIBRARIES += libvirt_storage_backend_disk.la
-libvirt_storage_backend_disk_la_LDFLAGS = $(AM_LDFLAGS_MOD)
-libvirt_storage_backend_disk_la_LIBADD = \
- libvirt.la \
- $(GLIB_LIBS) \
- $(NULL)
-endif WITH_STORAGE_DISK
-
if WITH_STORAGE_RBD
libvirt_storage_backend_rbd_la_SOURCES = $(STORAGE_DRIVER_RBD_SOURCES)
libvirt_storage_backend_rbd_la_LIBADD = \
diff --git a/src/storage/meson.build b/src/storage/meson.build
index 67b4fd4281f..8087bd45648 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -16,6 +16,10 @@ stoarge_file_fs_sources = [
'storage_file_fs.c',
]
+storage_backend_disk_sources = [
+ 'storage_backend_disk.c',
+]
+
storage_backend_iscsi_sources = [
'storage_backend_iscsi.c',
]
@@ -83,6 +87,16 @@ if conf.has('WITH_STORAGE')
}
endif
+if conf.has('WITH_STORAGE_DISK')
+ virt_modules += {
+ 'name': 'virt_storage_backend_disk',
+ 'sources': [
+ files(storage_backend_disk_sources),
+ ],
+ 'install_dir': storage_backend_install_dir,
+ }
+endif
+
if conf.has('WITH_STORAGE_ISCSI')
virt_modules += {
'name': 'virt_storage_backend_iscsi',
--
2.26.2