meson: src: build libvirt_storage_backend_iscsi_direct.so shared module

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index 78c2e0d3bf45755a1fc42dce15fd927c37ce1057..47843cc5d482982c2be56a3e04354d8fbe203702 100644 (file)
--- 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 0b0f3af3054919ba241ba28795354aaf1da43457..05b3131215c3bcee0a6ee93ac0d1518294133fce 100644 (file)
--- 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',