diff --git a/src/meson.build b/src/meson.build index 3a8b060b3a..70cf09d8bd 100644 --- a/src/meson.build +++ b/src/meson.build @@ -95,3 +95,5 @@ subdir('cpu') subdir('vmx') subdir('admin') + +subdir('vmware') diff --git a/src/vmware/Makefile.inc.am b/src/vmware/Makefile.inc.am index 3caa6340da..125e030461 100644 --- a/src/vmware/Makefile.inc.am +++ b/src/vmware/Makefile.inc.am @@ -1,25 +1,5 @@ # vim: filetype=automake -VMWARE_DRIVER_SOURCES = \ - vmware/vmware_driver.c \ - vmware/vmware_driver.h \ - vmware/vmware_conf.c \ - vmware/vmware_conf.h \ - $(NULL) - -DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(VMWARE_DRIVER_SOURCES)) - -if WITH_VMWARE -noinst_LTLIBRARIES += libvirt_driver_vmware.la -libvirt_la_BUILT_LIBADD += libvirt_driver_vmware.la -libvirt_driver_vmware_la_CFLAGS = \ - -I$(srcdir)/conf \ - -I$(srcdir)/vmx \ - $(AM_CFLAGS) \ - $(NULL) -libvirt_driver_vmware_la_SOURCES = $(VMWARE_DRIVER_SOURCES) -endif WITH_VMWARE - if WITH_VMWARE USED_SYM_FILES += $(srcdir)/libvirt_vmware.syms else ! WITH_VMWARE diff --git a/src/vmware/meson.build b/src/vmware/meson.build new file mode 100644 index 0000000000..285cc5eb9a --- /dev/null +++ b/src/vmware/meson.build @@ -0,0 +1,18 @@ +vmware_sources = [ + 'vmware_conf.c', + 'vmware_driver.c', +] + +if conf.has('WITH_VMWARE') + vmware_lib = static_library( + 'virt_vmware', + vmware_sources, + dependencies: [ + src_dep, + ], + include_directories: [ + conf_inc_dir, + vmx_inc_dir, + ], + ) +endif diff --git a/src/vmx/meson.build b/src/vmx/meson.build index b09225cab6..8bed1fac9f 100644 --- a/src/vmx/meson.build +++ b/src/vmx/meson.build @@ -16,3 +16,5 @@ if conf.has('WITH_VMX') ], ) endif + +vmx_inc_dir = include_directories('.')