meson: src: build libvirt_storage_driver.so shared module

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 7ca5b8fa2cf3a6e9566c359c6bd40067336941b2..d271485f9c889d2b4c6952740d1701167a10b476 100644 (file)
--- 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 87ba8c0bd1699c8a52cc7912ed188b4434f65ef3..c30743a1b48339fb951fec80a7aa62a4858903f8 100644 (file)
--- 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 36ef45b10ab3b6f51fa176b16db1159dcbbf346e..675c8a2c82712f6e077e97c343bc7780617b45bc 100644 (file)
--- 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