[libvirt PATCH 167/351] meson: src: build libvirt_driver_vz_impl.a static library
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/meson.build | 1 +
src/vz/Makefile.inc.am | 24 ------------------------
src/vz/meson.build | 23 +++++++++++++++++++++++
3 files changed, 24 insertions(+), 24 deletions(-)
create mode 100644 src/vz/meson.build
diff --git a/src/meson.build b/src/meson.build
index 87d1410b218..50f428da2ef 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -159,6 +159,7 @@ subdir('qemu')
subdir('test')
subdir('vbox')
subdir('vmware')
+subdir('vz')
driver_sources = [
diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am
index 7782fd89d75..d5d19a6f2ea 100644
--- a/src/vz/Makefile.inc.am
+++ b/src/vz/Makefile.inc.am
@@ -1,21 +1,10 @@
# vim: filetype=automake
-VZ_DRIVER_SOURCES = \
- vz/vz_driver.h \
- vz/vz_driver.c \
- vz/vz_utils.c \
- vz/vz_utils.h \
- vz/vz_sdk.h \
- vz/vz_sdk.c \
- $(NULL)
-
-
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VZ_DRIVER_SOURCES))
if WITH_VZ
-noinst_LTLIBRARIES += libvirt_driver_vz_impl.la
libvirt_driver_vz_la_SOURCES =
libvirt_driver_vz_la_LIBADD = \
libvirt_driver_vz_impl.la \
@@ -24,19 +13,6 @@ libvirt_driver_vz_la_LIBADD = \
$(NULL)
mod_LTLIBRARIES += libvirt_driver_vz.la
libvirt_driver_vz_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-libvirt_driver_vz_impl_la_CFLAGS = \
- -I$(srcdir)/conf \
- -I$(srcdir)/access \
- -I$(builddir)/access \
- $(AM_CFLAGS) \
- $(PARALLELS_SDK_CFLAGS) \
- $(LIBNL_CFLAGS) \
- $(NULL)
-libvirt_driver_vz_impl_la_SOURCES = $(VZ_DRIVER_SOURCES)
-libvirt_driver_vz_impl_la_LIBADD = \
- $(PARALLELS_SDK_LIBS) \
- $(LIBNL_LIBS) \
- $(NULL)
sbin_PROGRAMS += virtvzd
diff --git a/src/vz/meson.build b/src/vz/meson.build
new file mode 100644
index 00000000000..1f0c04bb8f2
--- /dev/null
+++ b/src/vz/meson.build
@@ -0,0 +1,23 @@
+vz_driver_sources = [
+ 'vz_driver.c',
+ 'vz_utils.c',
+ 'vz_sdk.c',
+]
+
+if conf.has('WITH_VZ')
+ vz_driver_impl = static_library(
+ 'virt_driver_vz_impl',
+ [
+ vz_driver_sources,
+ ],
+ dependencies: [
+ access_dep,
+ libnl_dep,
+ parallels_sdk_dep,
+ src_dep,
+ ],
+ include_directories: [
+ conf_inc_dir,
+ ],
+ )
+endif
--
2.26.2