meson: src: build lockd.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/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index a75e2abf623e1372fa5fa07ad29d995e0f3d7150..94aea3401958d8619bbcbc4e1bfef3d57dfdd61a 100644 (file)
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -42,23 +42,10 @@ OPENRC_INIT_FILES_IN += \
        locking/virtlockd.init.in \
        $(NULL)
 
-lockdriverdir = $(libdir)/libvirt/lock-driver
 lockdriver_LTLIBRARIES =
 
 if WITH_LIBVIRTD
-lockdriver_LTLIBRARIES += lockd.la
-lockd_la_SOURCES =
-lockd_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-lockd_la_LIBADD = \
-       libvirt.la \
-       libvirt_lockd_impl.la \
-       $(GLIB_LIBS) \
-       $(XDR_LIBS) \
-       $(NULL)
 augeas_DATA += locking/libvirt_lockd.aug
-if WITH_DTRACE_PROBES
-lockd_la_LIBADD += libvirt_probes.lo
-endif WITH_DTRACE_PROBES
 
 if WITH_QEMU
 augeastest_DATA += locking/test_libvirt_lockd.aug

diff --git a/src/locking/meson.build b/src/locking/meson.build
index d8255d00f64420fe432aae27c36324161743e7e3..af4245ec37ad80cc2f746e9a6efa16099d5a4c2f 100644 (file)
--- a/src/locking/meson.build
+++ b/src/locking/meson.build
@@ -62,4 +62,21 @@ if conf.has('WITH_LIBVIRTD')
       xdr_dep,
     ],
   )
+
+  lockdriver_dir = libdir / 'libvirt' / 'lock-driver'
+
+  virt_modules += {
+    'name': 'lockd',
+    'name_prefix': '',
+    'sources': [
+      dtrace_gen_objects,
+    ],
+    'link_whole': [
+      lockd_lib_impl,
+    ],
+    'link_args': [
+      libvirt_no_undefined,
+    ],
+    'install_dir': lockdriver_dir,
+  }
 endif