[libvirt PATCH 143/351] meson: src: build libvirt_driver_lock.a static library

[Pavel Hrdina]

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 src/locking/Makefile.inc.am | 21 ---------------------
 src/locking/meson.build     | 18 ++++++++++++++++++
 src/meson.build             |  1 +
 3 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 src/locking/meson.build

diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index b75588f9fce..3afc9803ce0 100644
--- 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
 
@@ -60,17 +50,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
index 00000000000..67822486253
--- /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 af9dcfbb5f5..96e49f2059c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -87,6 +87,7 @@ subdir('hypervisor')
 subdir('vmx')
 
 subdir('admin')
+subdir('locking')
 
 subdir('esx')
 subdir('hyperv')
-- 
2.26.2