From 3660e6ad3537a448633cef95d286875992b3dfd1 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Mon, 22 Jun 2020 15:42:28 +0200 Subject: [PATCH] meson: src: build libvirt_driver_vz.so shared module Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- src/vz/Makefile.inc.am | 9 --------- src/vz/meson.build | 10 ++++++++++ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am index d5d19a6f2e..f55d03d400 100644 --- a/src/vz/Makefile.inc.am +++ b/src/vz/Makefile.inc.am @@ -5,15 +5,6 @@ STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES)) if WITH_VZ -libvirt_driver_vz_la_SOURCES = -libvirt_driver_vz_la_LIBADD = \ - libvirt_driver_vz_impl.la \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) -mod_LTLIBRARIES += libvirt_driver_vz.la -libvirt_driver_vz_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) - sbin_PROGRAMS += virtvzd nodist_conf_DATA += vz/virtvzd.conf diff --git a/src/vz/meson.build b/src/vz/meson.build index 1f0c04bb8f..41cce92de2 100644 --- a/src/vz/meson.build +++ b/src/vz/meson.build @@ -20,4 +20,14 @@ if conf.has('WITH_VZ') conf_inc_dir, ], ) + + virt_modules += { + 'name': 'virt_driver_vz', + 'link_whole': [ + vz_driver_impl, + ], + 'link_args': [ + libvirt_no_undefined, + ], + } endif