meson: src: build libvirt_storage_backend_scsi.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 47843cc5d482982c2be56a3e04354d8fbe203702..c502f7006b27b59dc1f0d46d4a4629216476e1a2 100644 (file)
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -1,10 +1,5 @@
 # vim: filetype=automake
 
-STORAGE_DRIVER_SCSI_SOURCES = \
-       storage/storage_backend_scsi.h \
-       storage/storage_backend_scsi.c \
-       $(NULL)
-
 STORAGE_DRIVER_MPATH_SOURCES = \
        storage/storage_backend_mpath.h \
        storage/storage_backend_mpath.c \
@@ -138,21 +133,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \
 
 endif WITH_STORAGE
 
-if WITH_STORAGE_SCSI
-libvirt_storage_backend_scsi_la_SOURCES = $(STORAGE_DRIVER_SCSI_SOURCES)
-libvirt_storage_backend_scsi_la_CFLAGS = \
-       -I$(srcdir)/conf \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-storagebackend_LTLIBRARIES += libvirt_storage_backend_scsi.la
-libvirt_storage_backend_scsi_la_LDFLAGS = $(AM_LDFLAGS_MOD)
-libvirt_storage_backend_scsi_la_LIBADD = \
-       libvirt.la \
-       $(GLIB_LIBS) \
-       $(NULL)
-endif WITH_STORAGE_SCSI
-
 if WITH_STORAGE_MPATH
 libvirt_storage_backend_mpath_la_SOURCES = $(STORAGE_DRIVER_MPATH_SOURCES)
 libvirt_storage_backend_mpath_la_LIBADD = \

diff --git a/src/storage/meson.build b/src/storage/meson.build
index 05b3131215c3bcee0a6ee93ac0d1518294133fce..3ae4ab998ba0fd88e22b15b322f8992846f4f4c0 100644 (file)
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -28,6 +28,10 @@ storage_lvm_backend_sources = [
   'storage_backend_logical.c',
 ]
 
+storage_backend_scsi_sources = [
+  'storage_backend_scsi.c',
+]
+
 storage_backend_install_dir = libdir / 'libvirt' / 'storage-backend'
 storage_file_install_dir = libdir / 'libvirt' / 'storage-file'
 
@@ -107,3 +111,13 @@ if conf.has('WITH_STORAGE_LVM')
     'install_dir': storage_backend_install_dir,
   }
 endif
+
+if conf.has('WITH_STORAGE_SCSI')
+  virt_modules += {
+    'name': 'virt_storage_backend_scsi',
+    'sources': [
+      files(storage_backend_scsi_sources),
+    ],
+    'install_dir': storage_backend_install_dir,
+  }
+endif