Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
src/storage/Makefile.inc.am | 19 -------------------
src/storage/meson.build | 14 ++++++++++++++
2 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index c30743a1b48..15de3311c41 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -1,10 +1,5 @@
# vim: filetype=automake
-STORAGE_DRIVER_FS_SOURCES = \
- storage/storage_backend_fs.h \
- storage/storage_backend_fs.c \
- $(NULL)
-
STORAGE_FILE_FS_SOURCES = \
storage/storage_file_fs.h \
storage/storage_file_fs.c \
@@ -79,7 +74,6 @@ DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(STORAGE_DRIVER_SOURCES))
-storagebackenddir = $(libdir)/libvirt/storage-backend
storagebackend_LTLIBRARIES =
storagefiledir = $(libdir)/libvirt/storage-file
@@ -163,19 +157,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \
> $@ || rm -f $@
-libvirt_storage_backend_fs_la_SOURCES = $(STORAGE_DRIVER_FS_SOURCES)
-libvirt_storage_backend_fs_la_CFLAGS = \
- -I$(srcdir)/conf \
- $(AM_CFLAGS) \
- $(NULL)
-
-storagebackend_LTLIBRARIES += libvirt_storage_backend_fs.la
-libvirt_storage_backend_fs_la_LDFLAGS = $(AM_LDFLAGS_MOD)
-libvirt_storage_backend_fs_la_LIBADD = \
- libvirt.la \
- $(GLIB_LIBS) \
- $(NULL)
-
libvirt_storage_file_fs_la_SOURCES = $(STORAGE_FILE_FS_SOURCES)
libvirt_storage_file_fs_la_CFLAGS = \
-I$(srcdir)/conf \
diff --git a/src/storage/meson.build b/src/storage/meson.build
index 675c8a2c827..cad3654135c 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -8,6 +8,12 @@ storage_driver_sources = [
storage_driver_backend_sources,
]
+storage_backend_fs_sources = [
+ 'storage_backend_fs.c',
+]
+
+storage_backend_install_dir = libdir / 'libvirt' / 'storage-backend'
+
if conf.has('WITH_STORAGE')
storage_driver_impl_lib = static_library(
'virt_storage_driver_impl',
@@ -34,4 +40,12 @@ if conf.has('WITH_STORAGE')
libvirt_no_undefined,
],
}
+
+ virt_modules += {
+ 'name': 'virt_storage_backend_fs',
+ 'sources': [
+ files(storage_backend_fs_sources),
+ ],
+ 'install_dir': storage_backend_install_dir,
+ }
endif
--
2.26.2
