meson: src: build libvirt_driver_libxl_impl.a static library

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index db1f51e3ef893dbe74c3d47b6066d69160177aa7..c7ac93a75b70ea5b4171301e269573114a4b0b9a 100644 (file)
--- 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 (file)
index 0000000..7747bb6
--- /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 1212489e025d56ff2bc6a239e010e7f533b5ca50..5ab02c569f3a5c8a329c63acecee53978867a245 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -157,6 +157,7 @@ subdir('security')
 subdir('bhyve')
 subdir('esx')
 subdir('hyperv')
+subdir('libxl')
 subdir('openvz')
 subdir('test')
 subdir('vmware')