From 2f0aff27c86eef637e01d8b984204754e51649f1 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Wed, 11 Mar 2020 14:44:58 +0100 Subject: [PATCH] meson: src: build libvirt_hypervisor.a static library Signed-off-by: Pavel Hrdina Reviewed-by: Peter Krempa Reviewed-by: Neal Gompa --- 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 0e873f964f..b99eac910d 100644 --- 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 index bc48ab1266..0000000000 --- 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 0000000000..ea1dddfe98 --- /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 e1b9f21af3..559e89f0d1 100644 --- a/src/meson.build +++ b/src/meson.build @@ -92,6 +92,7 @@ subdir('rpc') subdir('access') subdir('cpu') +subdir('hypervisor') subdir('vmx') subdir('admin') -- 2.47.2