meson: src: build libvirt_driver_lock.a static library

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 476a8521c0ddf9d38ebcece196d141614326a75d..d3b0d86bfab815b960f577d9285d7910221d65a1 100644 (file)
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -1,15 +1,5 @@
 # vim: filetype=automake
 
-LOCK_DRIVER_SOURCES = \
-       locking/lock_manager.c \
-       locking/lock_manager.h \
-       locking/lock_driver.h \
-       locking/lock_driver_nop.h \
-       locking/lock_driver_nop.c \
-       locking/domain_lock.h \
-       locking/domain_lock.c \
-       $(NULL)
-
 LOCK_DRIVER_SANLOCK_SOURCES = \
        locking/lock_driver_sanlock.c
 
@@ -65,17 +55,6 @@ OPENRC_INIT_FILES_IN += \
        locking/virtlockd.init.in \
        $(NULL)
 
-noinst_LTLIBRARIES += libvirt_driver_lock.la
-
-libvirt_la_BUILT_LIBADD += libvirt_driver_lock.la
-libvirt_driver_lock_la_SOURCES = \
-       $(LOCK_DRIVER_SOURCES) \
-       $(NULL)
-libvirt_driver_lock_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       -I$(srcdir)/conf \
-       $(NULL)
-
 lockdriverdir = $(libdir)/libvirt/lock-driver
 lockdriver_LTLIBRARIES =
 

diff --git a/src/locking/meson.build b/src/locking/meson.build
new file mode 100644 (file)
index 0000000..6782248
--- /dev/null
+++ b/src/locking/meson.build
@@ -0,0 +1,18 @@
+lock_driver_sources = [
+  'lock_manager.c',
+  'lock_driver_nop.c',
+  'domain_lock.c',
+]
+
+lock_driver_lib = static_library(
+  'virt_lock_driver',
+  [
+    lock_driver_sources,
+  ],
+  dependencies: [
+    src_dep,
+  ],
+  include_directories: [
+    conf_inc_dir,
+  ],
+)

diff --git a/src/meson.build b/src/meson.build
index 2c6758eec9d756cc420a2d347b9f164a7f07538f..6127c5af5adbad4eeb10312a971ba5b47afde9a2 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -96,6 +96,7 @@ subdir('hypervisor')
 subdir('vmx')
 
 subdir('admin')
+subdir('locking')
 
 subdir('esx')
 subdir('hyperv')