Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
src/storage/Makefile.inc.am | 18 ------------------
src/storage/meson.build | 13 +++++++++++++
2 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index 15de3311c41..404a870d357 100644
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -1,10 +1,5 @@
# vim: filetype=automake
-STORAGE_FILE_FS_SOURCES = \
- storage/storage_file_fs.h \
- storage/storage_file_fs.c \
- $(NULL)
-
STORAGE_DRIVER_LVM_SOURCES = \
storage/storage_backend_logical.h \
storage/storage_backend_logical.c \
@@ -76,7 +71,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
storagebackend_LTLIBRARIES =
-storagefiledir = $(libdir)/libvirt/storage-file
storagefile_LTLIBRARIES =
if WITH_STORAGE
@@ -157,18 +151,6 @@ storage/test_virtstoraged.aug: remote/test_libvirtd.aug.in \
> $@ || rm -f $@
-libvirt_storage_file_fs_la_SOURCES = $(STORAGE_FILE_FS_SOURCES)
-libvirt_storage_file_fs_la_CFLAGS = \
- -I$(srcdir)/conf \
- $(AM_CFLAGS) \
- $(NULL)
-
-storagefile_LTLIBRARIES += libvirt_storage_file_fs.la
-libvirt_storage_file_fs_la_LDFLAGS = $(AM_LDFLAGS_MOD)
-libvirt_storage_file_fs_la_LIBADD = \
- libvirt.la \
- $(GLIB_LIBS) \
- $(NULL)
endif WITH_STORAGE
if WITH_STORAGE_LVM
diff --git a/src/storage/meson.build b/src/storage/meson.build
index cad3654135c..a44bfaabac6 100644
--- a/src/storage/meson.build
+++ b/src/storage/meson.build
@@ -12,7 +12,12 @@ storage_backend_fs_sources = [
'storage_backend_fs.c',
]
+stoarge_file_fs_sources = [
+ 'storage_file_fs.c',
+]
+
storage_backend_install_dir = libdir / 'libvirt' / 'storage-backend'
+storage_file_install_dir = libdir / 'libvirt' / 'storage-file'
if conf.has('WITH_STORAGE')
storage_driver_impl_lib = static_library(
@@ -48,4 +53,12 @@ if conf.has('WITH_STORAGE')
],
'install_dir': storage_backend_install_dir,
}
+
+ virt_modules += {
+ 'name': 'virt_storage_file_fs',
+ 'sources': [
+ files(stoarge_file_fs_sources),
+ ],
+ 'install_dir': storage_file_install_dir,
+ }
endif
--
2.26.2
