meson: src: build libvirt_hypervisor.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/Makefile.am b/src/Makefile.am
index 0e873f964f737325b8be761c9fb3c8566dd03a59..b99eac910d37d5f977f6f9cb72260a8e856694b9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -77,7 +77,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 (file)
index bc48ab1..0000000
--- 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 (file)
index 0000000..ea1dddf
--- /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 e1b9f21af3e63148391a78f03b7efe42d54413fd..559e89f0d1f46dc463c02cac1b0140ab8bb4b434 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -92,6 +92,7 @@ subdir('rpc')
 subdir('access')
 subdir('cpu')
 
+subdir('hypervisor')
 subdir('vmx')
 
 subdir('admin')