Signed-off-by: Pavel Hrdina <phrd...@redhat.com>
---
src/Makefile.am | 1 -
src/cpu/Makefile.inc.am | 27 ---------------------------
src/cpu/meson.build | 19 +++++++++++++++++++
src/meson.build | 1 +
4 files changed, 20 insertions(+), 28 deletions(-)
delete mode 100644 src/cpu/Makefile.inc.am
create mode 100644 src/cpu/meson.build
diff --git a/src/Makefile.am b/src/Makefile.am
index ecc757c455a..24c4a7cb194 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -69,7 +69,6 @@ COMMON_UNIT_VARS = \
lib_LTLIBRARIES += libvirt.la libvirt-qemu.la libvirt-lxc.la
include util/Makefile.inc.am
-include cpu/Makefile.inc.am
include cpu_map/Makefile.inc.am
include security/Makefile.inc.am
include access/Makefile.inc.am
diff --git a/src/cpu/Makefile.inc.am b/src/cpu/Makefile.inc.am
deleted file mode 100644
index 228112a3c6c..00000000000
--- a/src/cpu/Makefile.inc.am
+++ /dev/null
@@ -1,27 +0,0 @@
-# vim: filetype=automake
-
-CPU_SOURCES = \
- cpu/cpu.h \
- cpu/cpu.c \
- cpu/cpu_x86.h \
- cpu/cpu_x86.c \
- cpu/cpu_x86_data.h \
- cpu/cpu_s390.h \
- cpu/cpu_s390.c \
- cpu/cpu_arm.h \
- cpu/cpu_arm_data.h \
- cpu/cpu_arm.c \
- cpu/cpu_ppc64.h \
- cpu/cpu_ppc64.c \
- cpu/cpu_ppc64_data.h \
- cpu/cpu_map.h \
- cpu/cpu_map.c \
- $(NULL)
-
-noinst_LTLIBRARIES += libvirt_cpu.la
-libvirt_la_BUILT_LIBADD += libvirt_cpu.la
-libvirt_cpu_la_CFLAGS = \
- -I$(srcdir)/conf \
- $(AM_CFLAGS) \
- $(NULL)
-libvirt_cpu_la_SOURCES = $(CPU_SOURCES)
diff --git a/src/cpu/meson.build b/src/cpu/meson.build
new file mode 100644
index 00000000000..2404dc6b76f
--- /dev/null
+++ b/src/cpu/meson.build
@@ -0,0 +1,19 @@
+cpu_sources = [
+ 'cpu.c',
+ 'cpu_arm.c',
+ 'cpu_map.c',
+ 'cpu_ppc64.c',
+ 'cpu_s390.c',
+ 'cpu_x86.c',
+]
+
+cpu_lib = static_library(
+ 'virt_cpu',
+ cpu_sources,
+ dependencies: [
+ src_dep,
+ ],
+ include_directories: [
+ conf_inc_dir,
+ ],
+)
diff --git a/src/meson.build b/src/meson.build
index c2a4ccb17fd..866763e08d4 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -81,5 +81,6 @@ src_dep = declare_dependency(
subdir('conf')
subdir('rpc')
subdir('access')
+subdir('cpu')
subdir('admin')
--
2.26.2
