[libvirt PATCH 182/351] meson: src: build libvirt_storage_driver.so shared module

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:56:58 UTC 2020


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 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 a9fce0444ed..e309a96cbb3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,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 87ba8c0bd16..c30743a1b48 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 36ef45b10ab..675c8a2c827 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
-- 
2.26.2




More information about the libvir-list mailing list