[libvirt PATCH 137/351] meson: src: build libvirt_vmware.a static library
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/meson.build | 2 ++
src/vmware/Makefile.inc.am | 20 --------------------
src/vmware/meson.build | 18 ++++++++++++++++++
src/vmx/meson.build | 2 ++
4 files changed, 22 insertions(+), 20 deletions(-)
create mode 100644 src/vmware/meson.build
diff --git a/src/meson.build b/src/meson.build
index 59ddae341f7..84e810edfd2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -86,3 +86,5 @@ subdir('cpu')
subdir('vmx')
subdir('admin')
+
+subdir('vmware')
diff --git a/src/vmware/Makefile.inc.am b/src/vmware/Makefile.inc.am
index 3caa6340daf..125e0304618 100644
--- a/src/vmware/Makefile.inc.am
+++ b/src/vmware/Makefile.inc.am
@@ -1,25 +1,5 @@
# vim: filetype=automake
-VMWARE_DRIVER_SOURCES = \
- vmware/vmware_driver.c \
- vmware/vmware_driver.h \
- vmware/vmware_conf.c \
- vmware/vmware_conf.h \
- $(NULL)
-
-DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VMWARE_DRIVER_SOURCES))
-
-if WITH_VMWARE
-noinst_LTLIBRARIES += libvirt_driver_vmware.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_vmware.la
-libvirt_driver_vmware_la_CFLAGS = \
- -I$(srcdir)/conf \
- -I$(srcdir)/vmx \
- $(AM_CFLAGS) \
- $(NULL)
-libvirt_driver_vmware_la_SOURCES = $(VMWARE_DRIVER_SOURCES)
-endif WITH_VMWARE
-
if WITH_VMWARE
USED_SYM_FILES += $(srcdir)/libvirt_vmware.syms
else ! WITH_VMWARE
diff --git a/src/vmware/meson.build b/src/vmware/meson.build
new file mode 100644
index 00000000000..285cc5eb9a3
--- /dev/null
+++ b/src/vmware/meson.build
@@ -0,0 +1,18 @@
+vmware_sources = [
+ 'vmware_conf.c',
+ 'vmware_driver.c',
+]
+
+if conf.has('WITH_VMWARE')
+ vmware_lib = static_library(
+ 'virt_vmware',
+ vmware_sources,
+ dependencies: [
+ src_dep,
+ ],
+ include_directories: [
+ conf_inc_dir,
+ vmx_inc_dir,
+ ],
+ )
+endif
diff --git a/src/vmx/meson.build b/src/vmx/meson.build
index b09225cab68..8bed1fac9fa 100644
--- a/src/vmx/meson.build
+++ b/src/vmx/meson.build
@@ -16,3 +16,5 @@ if conf.has('WITH_VMX')
],
)
endif
+
+vmx_inc_dir = include_directories('.')
--
2.26.2