meson: src: build libvirt_openvz.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/meson.build b/src/meson.build
index 559e89f0d1f46dc463c02cac1b0140ab8bb4b434..ead0329a9efb35fa7854ded979a5acb1d9e2a211 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -99,4 +99,5 @@ subdir('admin')
 
 subdir('esx')
 subdir('hyperv')
+subdir('openvz')
 subdir('vmware')

diff --git a/src/openvz/Makefile.inc.am b/src/openvz/Makefile.inc.am
index 65b750b35af93bb205df421c870b1e82be3cdd5a..c01e33124ac9f813a6b8dab1fb5d8ee1e36411f0 100644 (file)
--- a/src/openvz/Makefile.inc.am
+++ b/src/openvz/Makefile.inc.am
@@ -1,26 +1,5 @@
 # vim: filetype=automake
 
-OPENVZ_DRIVER_SOURCES = \
-       openvz/openvz_conf.c \
-       openvz/openvz_conf.h \
-       openvz/openvz_driver.c \
-       openvz/openvz_driver.h \
-       openvz/openvz_util.c \
-       openvz/openvz_util.h \
-       $(NULL)
-
-DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(OPENVZ_DRIVER_SOURCES))
-
-if WITH_OPENVZ
-noinst_LTLIBRARIES += libvirt_driver_openvz.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_openvz.la
-libvirt_driver_openvz_la_CFLAGS = \
-       -I$(srcdir)/conf \
-       $(AM_CFLAGS) \
-       $(NULL)
-libvirt_driver_openvz_la_SOURCES = $(OPENVZ_DRIVER_SOURCES)
-endif WITH_OPENVZ
-
 if WITH_OPENVZ
 USED_SYM_FILES += $(srcdir)/libvirt_openvz.syms
 else ! WITH_OPENVZ

diff --git a/src/openvz/meson.build b/src/openvz/meson.build
new file mode 100644 (file)
index 0000000..b4e3bef
--- /dev/null
+++ b/src/openvz/meson.build
@@ -0,0 +1,20 @@
+openvz_sources = [
+  'openvz_conf.c',
+  'openvz_driver.c',
+  'openvz_util.c',
+]
+
+if conf.has('WITH_OPENVZ')
+  openvz_lib = static_library(
+    'virt_openvz',
+    [
+      openvz_sources,
+    ],
+    dependencies: [
+      src_dep,
+    ],
+    include_directories: [
+      conf_inc_dir,
+    ],
+  )
+endif