meson: src: build libvirt_storage_backend_logical.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 404a870d357fbc135fe1cdaf83d232582309e782..17a2d975cb53bca384c98a6e7e802d504522fd1a 100644 (file)
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -1,10 +1,5 @@
 # vim: filetype=automake
 
-STORAGE_DRIVER_LVM_SOURCES = \
-       storage/storage_backend_logical.h \
-       storage/storage_backend_logical.c \
-       $(NULL)
-
 STORAGE_DRIVER_ISCSI_SOURCES = \
        storage/storage_backend_iscsi.h \
        storage/storage_backend_iscsi.c \
@@ -153,21 +148,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \
 
 endif WITH_STORAGE
 
-if WITH_STORAGE_LVM
-libvirt_storage_backend_logical_la_SOURCES = $(STORAGE_DRIVER_LVM_SOURCES)
-libvirt_storage_backend_logical_la_CFLAGS = \
-       -I$(srcdir)/conf \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-storagebackend_LTLIBRARIES += libvirt_storage_backend_logical.la
-libvirt_storage_backend_logical_la_LDFLAGS = $(AM_LDFLAGS_MOD)
-libvirt_storage_backend_logical_la_LIBADD = \
-       libvirt.la \
-       $(GLIB_LIBS) \
-       $(NULL)
-endif WITH_STORAGE_LVM
-
 if WITH_STORAGE_ISCSI
 libvirt_storage_backend_iscsi_la_SOURCES = $(STORAGE_DRIVER_ISCSI_SOURCES)
 libvirt_storage_backend_iscsi_la_CFLAGS = \

diff --git a/src/storage/meson.build b/src/storage/meson.build
index a44bfaabac690bc62a7b12100fab355c8b439958..8ac52f059edf185ec24cc3acd1d368f3905887a5 100644 (file)
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -16,6 +16,10 @@ stoarge_file_fs_sources = [
   'storage_file_fs.c',
 ]
 
+storage_lvm_backend_sources = [
+  'storage_backend_logical.c',
+]
+
 storage_backend_install_dir = libdir / 'libvirt' / 'storage-backend'
 storage_file_install_dir = libdir / 'libvirt' / 'storage-file'
 
@@ -62,3 +66,13 @@ if conf.has('WITH_STORAGE')
     'install_dir': storage_file_install_dir,
   }
 endif
+
+if conf.has('WITH_STORAGE_LVM')
+  virt_modules += {
+    'name': 'virt_storage_backend_logical',
+    'sources': [
+      files(storage_lvm_backend_sources),
+    ],
+    'install_dir': storage_backend_install_dir,
+  }
+endif