Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
src/storage/Makefile.inc.am | 21 ---------------------
src/storage/meson.build | 14 ++++++++++++++
2 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index 041a9e12122..94a471eb0c0 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -1,10 +1,5 @@
# vim: filetype=automake
-STORAGE_DRIVER_ZFS_SOURCES = \
- storage/storage_backend_zfs.h \
- storage/storage_backend_zfs.c \
- $(NULL)
-
STORAGE_DRIVER_VSTORAGE_SOURCES = \
storage/storage_backend_vstorage.h \
storage/storage_backend_vstorage.c \
@@ -100,22 +95,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \
endif WITH_STORAGE
-if WITH_STORAGE_ZFS
-libvirt_storage_backend_zfs_la_SOURCES = \
- $(STORAGE_DRIVER_ZFS_SOURCES)
-libvirt_storage_backend_zfs_la_CFLAGS = \
- -I$(srcdir)/conf \
- $(AM_CFLAGS) \
- $(NULL)
-
-storagebackend_LTLIBRARIES += libvirt_storage_backend_zfs.la
-libvirt_storage_backend_zfs_la_LDFLAGS = $(AM_LDFLAGS_MOD)
-libvirt_storage_backend_zfs_la_LIBADD = \
- libvirt.la \
- $(GLIB_LIBS) \
- $(NULL)
-endif WITH_STORAGE_ZFS
-
if WITH_STORAGE_VSTORAGE
libvirt_storage_backend_vstorage_la_SOURCES = \
$(STORAGE_DRIVER_VSTORAGE_SOURCES)
diff --git a/src/storage/meson.build b/src/storage/meson.build
index c97a1b86eff..4450f1908f3 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -56,6 +56,10 @@ storage_backend_sheepdog_sources = [
'storage_backend_sheepdog.c',
]
+storage_backend_zfs_sources = [
+ 'storage_backend_zfs.c',
+]
+
storage_backend_install_dir = libdir / 'libvirt' / 'storage-backend'
storage_file_install_dir = libdir / 'libvirt' / 'storage-file'
@@ -226,3 +230,13 @@ if conf.has('WITH_STORAGE_SHEEPDOG')
'install_dir': storage_backend_install_dir,
}
endif
+
+if conf.has('WITH_STORAGE_ZFS')
+ virt_modules += {
+ 'name': 'virt_storage_backend_zfs',
+ 'sources': [
+ files(storage_backend_zfs_sources),
+ ],
+ 'install_dir': storage_backend_install_dir,
+ }
+endif
--
2.26.2
