[libvirt PATCH 166/351] meson: src: build libvirt_driver_vbox_impl.a static library
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/meson.build | 1 +
src/vbox/Makefile.inc.am | 34 ----------------------------------
src/vbox/meson.build | 31 +++++++++++++++++++++++++++++++
3 files changed, 32 insertions(+), 34 deletions(-)
create mode 100644 src/vbox/meson.build
diff --git a/src/meson.build b/src/meson.build
index aac5a256b07..87d1410b218 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -157,6 +157,7 @@ subdir('lxc')
subdir('openvz')
subdir('qemu')
subdir('test')
+subdir('vbox')
subdir('vmware')
diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am
index 8acbdc84609..19ffff223b1 100644
--- a/src/vbox/Makefile.inc.am
+++ b/src/vbox/Makefile.inc.am
@@ -1,26 +1,5 @@
# vim: filetype=automake
-VBOX_DRIVER_SOURCES = \
- vbox/vbox_driver.c \
- vbox/vbox_driver.h \
- vbox/vbox_snapshot_conf.c \
- vbox/vbox_snapshot_conf.h \
- vbox/vbox_V5_2.c \
- vbox/vbox_CAPI_v5_2.h \
- vbox/vbox_CAPI_v6_0.h \
- vbox/vbox_V6_0.c \
- vbox/vbox_CAPI_v6_1.h \
- vbox/vbox_V6_1.c \
- vbox/vbox_common.c \
- vbox/vbox_common.h \
- vbox/vbox_uniformed_api.h \
- vbox/vbox_get_driver.h \
- vbox/vbox_network.c \
- vbox/vbox_storage.c \
- vbox/vbox_XPCOMCGlue.c \
- vbox/vbox_XPCOMCGlue.h \
- $(NULL)
-
DRIVER_SOURCE_FILES += \
$(addprefix $(srcdir)/,$(VBOX_DRIVER_SOURCES)) \
$(srcdir)/vbox/vbox_tmpl.c \
@@ -37,19 +16,6 @@ libvirt_driver_vbox_la_LIBADD = \
mod_LTLIBRARIES += libvirt_driver_vbox.la
libvirt_driver_vbox_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-libvirt_driver_vbox_impl_la_CFLAGS = \
- -I$(srcdir)/conf \
- $(AM_CFLAGS) \
- -DVBOX_DRIVER \
- $(NULL)
-libvirt_driver_vbox_impl_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_vbox_impl_la_LIBADD = \
- $(DLOPEN_LIBS) \
- $(WIN32_EXTRA_LIBS) \
- $(LIBXML_LIBS) \
- $(NULL)
-libvirt_driver_vbox_impl_la_SOURCES = $(VBOX_DRIVER_SOURCES)
-
sbin_PROGRAMS += virtvboxd
nodist_conf_DATA += vbox/virtvboxd.conf
diff --git a/src/vbox/meson.build b/src/vbox/meson.build
new file mode 100644
index 00000000000..c27f9418249
--- /dev/null
+++ b/src/vbox/meson.build
@@ -0,0 +1,31 @@
+vbox_driver_sources = [
+ 'vbox_V5_2.c',
+ 'vbox_V6_0.c',
+ 'vbox_V6_1.c',
+ 'vbox_common.c',
+ 'vbox_driver.c',
+ 'vbox_network.c',
+ 'vbox_snapshot_conf.c',
+ 'vbox_storage.c',
+ 'vbox_XPCOMCGlue.c',
+]
+
+if conf.has('WITH_VBOX')
+ vbox_driver_impl = static_library(
+ 'virt_driver_vbox_impl',
+ [
+ vbox_driver_sources,
+ ],
+ c_args: [
+ '-DVBOX_DRIVER',
+ ],
+ dependencies: [
+ dlopen_dep,
+ src_dep,
+ win32_dep,
+ ],
+ include_directories: [
+ conf_inc_dir,
+ ],
+ )
+endif
--
2.26.2