Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
src/libxl/Makefile.inc.am | 39 ---------------------------------------
src/libxl/meson.build | 29 +++++++++++++++++++++++++++++
src/meson.build | 1 +
3 files changed, 30 insertions(+), 39 deletions(-)
create mode 100644 src/libxl/meson.build
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index db1f51e3ef8..c7ac93a75b7 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -1,32 +1,9 @@
# vim: filetype=automake
-LIBXL_DRIVER_SOURCES = \
- libxl/xenxs_private.h \
- libxl/xen_common.c \
- libxl/xen_common.h \
- libxl/xen_xl.c \
- libxl/xen_xl.h \
- libxl/xen_xm.c \
- libxl/xen_xm.h \
- libxl/libxl_conf.c \
- libxl/libxl_conf.h \
- libxl/libxl_capabilities.c \
- libxl/libxl_capabilities.h \
- libxl/libxl_domain.c \
- libxl/libxl_domain.h \
- libxl/libxl_driver.c \
- libxl/libxl_driver.h \
- libxl/libxl_logger.c \
- libxl/libxl_logger.h \
- libxl/libxl_migration.c \
- libxl/libxl_migration.h \
- $(NULL)
-
DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES))
STATEFUL_DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(LIBXL_DRIVER_SOURCES))
if WITH_LIBXL
-noinst_LTLIBRARIES += libvirt_driver_libxl_impl.la
libvirt_driver_libxl_la_SOURCES =
libvirt_driver_libxl_la_LIBADD = \
libvirt_driver_libxl_impl.la \
@@ -36,22 +13,6 @@ libvirt_driver_libxl_la_LIBADD = \
mod_LTLIBRARIES += libvirt_driver_libxl.la
libvirt_driver_libxl_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-libvirt_driver_libxl_impl_la_CFLAGS = \
- $(LIBXL_CFLAGS) \
- $(LIBXML_CFLAGS) \
- -I$(srcdir)/access \
- -I$(builddir)/access \
- -I$(srcdir)/conf \
- -I$(srcdir)/hypervisor \
- $(AM_CFLAGS) \
- $(NULL)
-libvirt_driver_libxl_impl_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_libxl_impl_la_LIBADD = \
- $(LIBXL_LIBS) \
- $(LIBXML_LIBS) \
- $(NULL)
-libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES)
-
sbin_PROGRAMS += virtxend
nodist_conf_DATA += libxl/virtxend.conf
diff --git a/src/libxl/meson.build b/src/libxl/meson.build
new file mode 100644
index 00000000000..7747bb61a75
--- /dev/null
+++ b/src/libxl/meson.build
@@ -0,0 +1,29 @@
+libxl_driver_sources = [
+ 'libxl_capabilities.c',
+ 'libxl_conf.c',
+ 'libxl_domain.c',
+ 'libxl_driver.c',
+ 'libxl_logger.c',
+ 'libxl_migration.c',
+ 'xen_common.c',
+ 'xen_xl.c',
+ 'xen_xm.c',
+]
+
+if conf.has('WITH_LIBXL')
+ libxl_driver_imp = static_library(
+ 'virt_driver_libxl_impl',
+ [
+ libxl_driver_sources,
+ ],
+ dependencies: [
+ access_dep,
+ libxl_dep,
+ src_dep,
+ ],
+ include_directories: [
+ conf_inc_dir,
+ hypervisor_inc_dir,
+ ],
+ )
+endif
diff --git a/src/meson.build b/src/meson.build
index ca94fe64bd9..44992fac02b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -148,6 +148,7 @@ subdir('security')
subdir('bhyve')
subdir('esx')
subdir('hyperv')
+subdir('libxl')
subdir('openvz')
subdir('test')
subdir('vmware')
--
2.26.2
