Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
src/storage/Makefile.inc.am | 23 -----------------------
src/storage/meson.build | 17 +++++++++++++++++
2 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index 78c2e0d3bf4..47843cc5d48 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -1,10 +1,5 @@
# vim: filetype=automake
-STORAGE_DRIVER_ISCSI_DIRECT_SOURCES = \
- storage/storage_backend_iscsi_direct.h \
- storage/storage_backend_iscsi_direct.c \
- $(NULL)
-
STORAGE_DRIVER_SCSI_SOURCES = \
storage/storage_backend_scsi.h \
storage/storage_backend_scsi.c \
@@ -143,24 +138,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \
endif WITH_STORAGE
-if WITH_STORAGE_ISCSI_DIRECT
-libvirt_storage_backend_iscsi_direct_la_SOURCES = \
- $(STORAGE_DRIVER_ISCSI_DIRECT_SOURCES)
-libvirt_storage_backend_iscsi_direct_la_CFLAGS = \
- -I$(srcdir)/conf \
- $(LIBISCSI_CFLAGS) \
- $(AM_CFLAGS) \
- $(NULL)
-
-storagebackend_LTLIBRARIES += libvirt_storage_backend_iscsi-direct.la
-libvirt_storage_backend_iscsi_direct_la_LDFLAGS = $(AM_LDFLAGS_MOD)
-libvirt_storage_backend_iscsi_direct_la_LIBADD = \
- libvirt.la \
- $(GLIB_LIBS) \
- $(LIBISCSI_LIBS) \
- $(NULL)
-endif WITH_STORAGE_ISCSI_DIRECT
-
if WITH_STORAGE_SCSI
libvirt_storage_backend_scsi_la_SOURCES = $(STORAGE_DRIVER_SCSI_SOURCES)
libvirt_storage_backend_scsi_la_CFLAGS = \
diff --git a/src/storage/meson.build b/src/storage/meson.build
index 0b0f3af3054..05b3131215c 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -20,6 +20,10 @@ storage_backend_iscsi_sources = [
'storage_backend_iscsi.c',
]
+storage_backend_iscsi_direct_sources = [
+ 'storage_backend_iscsi_direct.c',
+]
+
storage_lvm_backend_sources = [
'storage_backend_logical.c',
]
@@ -81,6 +85,19 @@ if conf.has('WITH_STORAGE_ISCSI')
}
endif
+if conf.has('WITH_STORAGE_ISCSI_DIRECT')
+ virt_modules += {
+ 'name': 'virt_storage_backend_iscsi-direct',
+ 'sources': [
+ files(storage_backend_iscsi_direct_sources),
+ ],
+ 'deps': [
+ libiscsi_dep
+ ],
+ 'install_dir': storage_backend_install_dir,
+ }
+endif
+
if conf.has('WITH_STORAGE_LVM')
virt_modules += {
'name': 'virt_storage_backend_logical',
--
2.26.2
