Signed-off-by: Pavel Hrdina <phrd...@redhat.com> --- src/locking/Makefile.inc.am | 15 --------------- src/locking/meson.build | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am index 5b00f5a0c9e..49cf0252162 100644 --- a/src/locking/Makefile.inc.am +++ b/src/locking/Makefile.inc.am @@ -1,8 +1,5 @@ # vim: filetype=automake -LOCK_DRIVER_SANLOCK_SOURCES = \ - locking/lock_driver_sanlock.c - LOCK_DRIVER_SANLOCK_HELPER_SOURCES = \ locking/sanlock_helper.c @@ -38,8 +35,6 @@ OPENRC_INIT_FILES_IN += \ locking/virtlockd.init.in \ $(NULL) -lockdriver_LTLIBRARIES = - if WITH_LIBVIRTD augeas_DATA += locking/libvirt_lockd.aug @@ -89,16 +84,6 @@ virtlockd_CFLAGS += \ endif WITH_SASL if WITH_SANLOCK -lockdriver_LTLIBRARIES += sanlock.la -sanlock_la_SOURCES = $(LOCK_DRIVER_SANLOCK_SOURCES) -sanlock_la_CFLAGS = -I$(srcdir)/conf $(AM_CFLAGS) -sanlock_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF) -sanlock_la_LIBADD = \ - -lsanlock_client \ - libvirt.la \ - $(GLIB_LIBS) \ - $(NULL) - augeas_DATA += locking/libvirt_sanlock.aug if WITH_QEMU diff --git a/src/locking/meson.build b/src/locking/meson.build index af4245ec37a..4767ee9c869 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build @@ -30,6 +30,10 @@ lock_protocol_generated += custom_target( ], ) +sanlock_sources = [ + 'lock_driver_sanlock.c', +] + lock_driver_lib = static_library( 'virt_lock_driver', [ @@ -79,4 +83,21 @@ if conf.has('WITH_LIBVIRTD') ], 'install_dir': lockdriver_dir, } + + if conf.has('WITH_SANLOCK') + virt_modules += { + 'name': 'sanlock', + 'name_prefix': '', + 'sources': [ + files(sanlock_sources), + ], + 'deps': [ + sanlock_dep, + ], + 'link_args': [ + libvirt_no_undefined, + ], + 'install_dir': lockdriver_dir, + } + endif endif -- 2.26.2