[libvirt PATCH 173/351] meson: src: build libvirt_driver_network.so shared module

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


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 src/network/Makefile.inc.am | 13 -------------
 src/network/meson.build     | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index c93b2e693d0..523ae453797 100644
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -10,19 +10,6 @@ STATEFUL_DRIVER_SOURCE_FILES += \
 
 
 if WITH_NETWORK
-
-noinst_LTLIBRARIES += libvirt_driver_network_impl.la
-libvirt_driver_network_la_SOURCES =
-libvirt_driver_network_la_LIBADD = \
-	libvirt_driver_network_impl.la \
-	libvirt.la \
-	$(GLIB_LIBS) \
-	$(LIBNL_LIBS) \
-	$(DBUS_LIBS) \
-	$(NULL)
-mod_LTLIBRARIES += libvirt_driver_network.la
-libvirt_driver_network_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
 sbin_PROGRAMS += virtnetworkd
 
 nodist_conf_DATA += network/virtnetworkd.conf
diff --git a/src/network/meson.build b/src/network/meson.build
index 2b05544fd22..879a5731a6e 100644
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -19,4 +19,18 @@ if conf.has('WITH_NETWORK')
       conf_inc_dir,
     ],
   )
+
+  virt_modules += {
+    'name': 'virt_driver_network',
+    'deps': [
+      dbus_dep,
+      libnl_dep,
+    ],
+    'link_whole': [
+      network_driver_impl,
+    ],
+    'link_args': [
+      libvirt_no_undefined,
+    ],
+  }
 endif
-- 
2.26.2




More information about the libvir-list mailing list