From: Pavel Hrdina <phrdina@redhat.com>
Date: Mon, 22 Jun 2020 13:34:23 +0000 (+0200)
Subject: meson: src: build libvirt_driver_nwfilter.so shared module
X-Git-Tag: v6.7.0-rc1~428
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc38e525b47b7cdd6efca41789e46d133a8969e1;p=thirdparty%2Flibvirt.git

meson: src: build libvirt_driver_nwfilter.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/nwfilter/Makefile.inc.am b/src/nwfilter/Makefile.inc.am
index ba07992027..d853282b70 100644
--- a/src/nwfilter/Makefile.inc.am
+++ b/src/nwfilter/Makefile.inc.am
@@ -11,13 +11,6 @@ if WITH_NWFILTER
 nwfilterxmldir = $(sysconfdir)/libvirt/nwfilter
 nwfilterxml_DATA = $(NWFILTER_XML_FILES)
 
-libvirt_driver_nwfilter_la_SOURCES =
-libvirt_driver_nwfilter_la_LIBADD = \
-	libvirt_driver_nwfilter_impl.la \
-	libvirt.la
-mod_LTLIBRARIES += libvirt_driver_nwfilter.la
-libvirt_driver_nwfilter_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-
 sbin_PROGRAMS += virtnwfilterd
 
 nodist_conf_DATA += nwfilter/virtnwfilterd.conf
diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build
index fe792058b9..8da853c3ec 100644
--- a/src/nwfilter/meson.build
+++ b/src/nwfilter/meson.build
@@ -23,4 +23,14 @@ if conf.has('WITH_NWFILTER')
       conf_inc_dir,
     ],
   )
+
+  virt_modules += {
+    'name': 'virt_driver_nwfilter',
+    'link_whole': [
+      nwfilter_driver_impl,
+    ],
+    'link_args': [
+      libvirt_no_undefined,
+    ],
+  }
 endif