[libvirt PATCH 136/351] meson: src: build libvirt_vmx.a static library

Pavel Hrdina phrdina at redhat.com
Thu Jul 16 09:56:12 UTC 2020


Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 src/meson.build         |  2 ++
 src/vmx/Makefile.inc.am | 15 ---------------
 src/vmx/meson.build     | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 src/vmx/meson.build

diff --git a/src/meson.build b/src/meson.build
index 866763e08d4..59ddae341f7 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -83,4 +83,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 88df423fed5..8912f6ee21c 100644
--- 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
index 00000000000..b09225cab68
--- /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
-- 
2.26.2




More information about the libvir-list mailing list