From 141e0175199d9e9061d884945ea1e870b987d5ae Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 22 Jun 2020 15:25:53 +0200 Subject: [PATCH] meson: src: build libvirt_driver_network.so shared module Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- 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 c93b2e693d..523ae45379 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 2b05544fd2..879a5731a6 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