Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- src/meson.build | 1 + src/openvz/Makefile.inc.am | 21 --------------------- src/openvz/meson.build | 20 ++++++++++++++++++++ 3 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 src/openvz/meson.build diff --git a/src/meson.build b/src/meson.build index bf918d91ffe..61be43904e8 100644 --- a/src/meson.build +++ b/src/meson.build @@ -90,4 +90,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 65b750b35af..c01e33124ac 100644 --- 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 index 00000000000..b4e3befccb5 --- /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 -- 2.26.2