meson: src: build libvirt_vmx.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/meson.build b/src/meson.build
index d157ad88494858401d14cf498390d78fe3ceb2c3..3a8b060b3aff5d30bf51d12687d628fbafd84767 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -92,4 +92,6 @@ subdir('rpc')
 subdir('access')
 subdir('cpu')
 
+subdir('vmx')
+
 subdir('admin')

diff --git a/src/vmx/Makefile.inc.am b/src/vmx/Makefile.inc.am
index 88df423fed522e1aaaea7a883cfd541b78218e6f..8912f6ee21cfbef38d466f090a88c03cb4075b6b 100644 (file)
--- a/src/vmx/Makefile.inc.am
+++ b/src/vmx/Makefile.inc.am
@@ -1,20 +1,5 @@
 # vim: filetype=automake
 
-VMX_SOURCES = \
-       vmx/vmx.c \
-       vmx/vmx.h \
-       $(NULL)
-
-if WITH_VMX
-noinst_LTLIBRARIES += libvirt_vmx.la
-libvirt_la_BUILT_LIBADD += libvirt_vmx.la
-libvirt_vmx_la_CFLAGS = \
-       -I$(srcdir)/conf \
-       $(AM_CFLAGS) \
-       $(NULL)
-libvirt_vmx_la_SOURCES = $(VMX_SOURCES)
-endif WITH_VMX
-
 if WITH_VMX
 USED_SYM_FILES += $(srcdir)/libvirt_vmx.syms
 else ! WITH_VMX

diff --git a/src/vmx/meson.build b/src/vmx/meson.build
new file mode 100644 (file)
index 0000000..b09225c
--- /dev/null
+++ b/src/vmx/meson.build
@@ -0,0 +1,18 @@
+vmx_sources = [
+  'vmx.c',
+]
+
+if conf.has('WITH_VMX')
+  vmx_lib = static_library(
+    'virt_vmx',
+    [
+      vmx_sources,
+    ],
+    dependencies: [
+      src_dep,
+    ],
+    include_directories: [
+      conf_inc_dir,
+    ],
+  )
+endif