meson: src: build libvirt_cpu.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 0e8bfdb9aae2a645fecdcea505907d6c4c922935..953c655d99955191726a1b08512613dfdee3d6b0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -70,7 +70,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 (file)
index 228112a..0000000
--- 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 (file)
index 0000000..2404dc6
--- /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 8a5f680f93a5527fe641cf3bbbace023a73ed123..d157ad88494858401d14cf498390d78fe3ceb2c3 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -90,5 +90,6 @@ src_dep = declare_dependency(
 subdir('conf')
 subdir('rpc')
 subdir('access')
+subdir('cpu')
 
 subdir('admin')