meson: src: build virtlockd daemon binary

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/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index ecfdd4d7aabe8d171eafce3f3573bf210f0b2731..20974dd04617edb48b7594eeba97a9d83000eadf 100644 (file)
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -3,23 +3,6 @@
 LOCK_DRIVER_SANLOCK_HELPER_SOURCES = \
        locking/sanlock_helper.c
 
-LOCK_DAEMON_GENERATED = \
-       locking/lock_daemon_dispatch_stubs.h
-       $(NULL)
-
-LOCK_DAEMON_SOURCES = \
-       locking/lock_daemon.h \
-       locking/lock_daemon.c \
-       locking/lock_daemon_config.h \
-       locking/lock_daemon_config.c \
-       locking/lock_daemon_dispatch.c \
-       locking/lock_daemon_dispatch.h \
-       $(NULL)
-
-BUILT_SOURCES += \
-       $(LOCK_DAEMON_GENERATED) \
-       $(NULL)
-
 RPC_PROBE_FILES += $(srcdir)/locking/lock_protocol.x
 SYSCONF_FILES += locking/virtlockd.sysconf
 
@@ -51,42 +34,6 @@ if WITH_LIBXL
 nodist_conf_DATA += locking/libxl-lockd.conf
 endif WITH_LIBXL
 
-sbin_PROGRAMS += virtlockd
-
-virtlockd_SOURCES = \
-       $(LOCK_DAEMON_SOURCES) \
-       $(NULL)
-nodist_virtlockd_SOURCES = \
-       $(LOCK_PROTOCOL_GENERATED) \
-       $(LOCK_DAEMON_GENERATED) \
-       $(NULL)
-virtlockd_CFLAGS = \
-       -I$(srcdir)/locking \
-       -I$(builddir)/locking \
-       -I$(builddir)/rpc \
-       $(AM_CFLAGS) \
-       $(XDR_CFLAGS) \
-       $(NULL)
-virtlockd_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       $(XDR_LIBS) \
-       $(NO_UNDEFINED_LDFLAGS) \
-       $(NULL)
-virtlockd_LDADD = \
-       libvirt.la \
-       libvirt_driver_admin.la \
-       $(GLIB_LIBS) \
-       $(NULL)
-if WITH_DTRACE_PROBES
-virtlockd_LDADD += libvirt_probes.lo
-endif WITH_DTRACE_PROBES
-
-if WITH_SASL
-virtlockd_CFLAGS += \
-       $(SASL_CFLAGS) \
-       $(NULL)
-endif WITH_SASL
-
 if WITH_SANLOCK
 augeas_DATA += locking/libvirt_sanlock.aug
 
@@ -173,12 +120,6 @@ locking/%-sanlock.conf: $(srcdir)/locking/sanlock.conf
        cp $< $@
 
 
-locking/lock_daemon_dispatch_stubs.h: $(LOCK_PROTOCOL) \
-               $(srcdir)/rpc/gendispatch.pl Makefile.am
-       $(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl --mode=server \
-           virLockSpaceProtocol VIR_LOCK_SPACE_PROTOCOL \
-           $(LOCK_PROTOCOL) > locking/lock_daemon_dispatch_stubs.h
-
 virtlockd.init: locking/virtlockd.init.in $(top_builddir)/config.status
        $(AM_V_GEN)$(SED) $(COMMON_UNIT_VARS) $< > $@-t && mv $@-t $@
 

diff --git a/src/locking/meson.build b/src/locking/meson.build
index 4767ee9c86919c851eb8c718f974fb9aac9cdb76..cdd558779c26f6e2df7ac6a907c1b954b9abb1c8 100644 (file)
--- a/src/locking/meson.build
+++ b/src/locking/meson.build
@@ -30,6 +30,23 @@ lock_protocol_generated += custom_target(
   ],
 )
 
+lock_daemon_sources = files(
+  'lock_daemon.c',
+  'lock_daemon_config.c',
+  'lock_daemon_dispatch.c',
+)
+
+lock_daemon_generated = custom_target(
+  'lock_daemon_dispatch_stubs.h',
+  input: lock_protocol,
+  output: 'lock_daemon_dispatch_stubs.h',
+  command: [
+    gendispatch_prog, '--mode=server',
+    'virLockSpaceProtocol', 'VIR_LOCK_SPACE_PROTOCOL', '@INPUT@',
+  ],
+  capture: true,
+)
+
 sanlock_sources = [
   'lock_driver_sanlock.c',
 ]
@@ -100,4 +117,16 @@ if conf.has('WITH_LIBVIRTD')
       'install_dir': lockdriver_dir,
     }
   endif
+
+  virt_daemons += {
+    'name': 'virtlockd',
+    'sources': [
+      lock_daemon_sources,
+      lock_daemon_generated,
+      lock_protocol_generated,
+    ],
+    'include': [
+      include_directories('.'),
+    ],
+  }
 endif