From 06b38f49f77c4bf15dd379b0712776abb49aeb9b Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 22 Jun 2020 15:48:09 +0200 Subject: [PATCH] meson: src: build libvirt_storage_driver.so shared module Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- src/Makefile.am | 1 - src/storage/Makefile.inc.am | 9 --------- src/storage/meson.build | 10 ++++++++++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7ca5b8fa2c..d271485f9c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,7 +25,6 @@ nodist_conf_DATA = DRIVER_SOURCE_FILES = STATEFUL_DRIVER_SOURCE_FILES = noinst_LTLIBRARIES = -mod_LTLIBRARIES = INSTALL_DATA_DIRS = INSTALL_DATA_LOCAL = UNINSTALL_LOCAL = diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am index 87ba8c0bd1..c30743a1b4 100644 --- a/src/storage/Makefile.inc.am +++ b/src/storage/Makefile.inc.am @@ -86,15 +86,6 @@ storagefiledir = $(libdir)/libvirt/storage-file storagefile_LTLIBRARIES = if WITH_STORAGE -libvirt_driver_storage_la_SOURCES = -libvirt_driver_storage_la_LIBADD = \ - libvirt_driver_storage_impl.la \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -mod_LTLIBRARIES += libvirt_driver_storage.la -libvirt_driver_storage_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) - sbin_PROGRAMS += virtstoraged nodist_conf_DATA += storage/virtstoraged.conf diff --git a/src/storage/meson.build b/src/storage/meson.build index 36ef45b10a..675c8a2c82 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -24,4 +24,14 @@ if conf.has('WITH_STORAGE') conf_inc_dir, ], ) + + virt_modules += { + 'name': 'virt_driver_storage', + 'link_whole': [ + storage_driver_impl_lib, + ], + 'link_args': [ + libvirt_no_undefined, + ], + } endif