[libvirt PATCH 180/351] meson: src: build lockd.so shared module

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
 src/locking/Makefile.inc.am | 13 -------------
 src/locking/meson.build     | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index b8eac29d242..5b00f5a0c9e 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -38,23 +38,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 d8255d00f64..af4245ec37a 100644
--- 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
-- 
2.26.2




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux