[libvirt PATCH 140/351] meson: src: build libvirt_hypervisor.a static library

[Pavel Hrdina]

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 src/Makefile.am                |  1 -
 src/hypervisor/Makefile.inc.am | 20 --------------------
 src/hypervisor/meson.build     | 21 +++++++++++++++++++++
 src/meson.build                |  1 +
 4 files changed, 22 insertions(+), 21 deletions(-)
 delete mode 100644 src/hypervisor/Makefile.inc.am
 create mode 100644 src/hypervisor/meson.build

diff --git a/src/Makefile.am b/src/Makefile.am
index daab843febd..b7fd239d0fb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -76,7 +76,6 @@ include logging/Makefile.inc.am
 include locking/Makefile.inc.am
 include admin/Makefile.inc.am
 include test/Makefile.inc.am
-include hypervisor/Makefile.inc.am
 include esx/Makefile.inc.am
 include vmx/Makefile.inc.am
 include vmware/Makefile.inc.am
diff --git a/src/hypervisor/Makefile.inc.am b/src/hypervisor/Makefile.inc.am
deleted file mode 100644
index bc48ab12661..00000000000
--- a/src/hypervisor/Makefile.inc.am
+++ /dev/null
@@ -1,20 +0,0 @@
-# vim: filetype=automake
-
-HYPERVISOR_SOURCES = \
-	hypervisor/domain_cgroup.h \
-	hypervisor/domain_cgroup.c \
-	hypervisor/domain_driver.h \
-	hypervisor/domain_driver.c \
-	hypervisor/virclosecallbacks.h \
-	hypervisor/virclosecallbacks.c \
-	hypervisor/virhostdev.h \
-	hypervisor/virhostdev.c \
-	$(NULL)
-
-noinst_LTLIBRARIES += libvirt_hypervisor.la
-libvirt_la_BUILT_LIBADD += libvirt_hypervisor.la
-libvirt_hypervisor_la_CFLAGS = \
-	-I$(srcdir)/conf \
-	$(AM_CFLAGS) \
-	$(NULL)
-libvirt_hypervisor_la_SOURCES = $(HYPERVISOR_SOURCES)
diff --git a/src/hypervisor/meson.build b/src/hypervisor/meson.build
new file mode 100644
index 00000000000..ea1dddfe983
--- /dev/null
+++ b/src/hypervisor/meson.build
@@ -0,0 +1,21 @@
+hypervisor_sources = [
+  'domain_cgroup.c',
+  'domain_driver.c',
+  'virclosecallbacks.c',
+  'virhostdev.c',
+]
+
+hypervisor_lib = static_library(
+  'virt_hypervisor',
+  [
+    hypervisor_sources,
+  ],
+  dependencies: [
+    src_dep,
+  ],
+  include_directories: [
+    conf_inc_dir,
+  ],
+)
+
+hypervisor_inc_dir = include_directories('.')
diff --git a/src/meson.build b/src/meson.build
index 3186f1c13e3..bf918d91ffe 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -83,6 +83,7 @@ subdir('rpc')
 subdir('access')
 subdir('cpu')
 
+subdir('hypervisor')
 subdir('vmx')
 
 subdir('admin')
-- 
2.26.2