meson: src: build libvirt_driver_log.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/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index 133b52f3a9713ec18ca51436dbde7821c56d0ff4..61a07f8e1239b88dfd2e8bceae6d834a514efab4 100644 (file)
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -9,11 +9,6 @@ LOG_DAEMON_GENERATED = \
        logging/log_daemon_dispatch_stubs.h
        $(NULL)
 
-LOG_DRIVER_SOURCES = \
-       logging/log_manager.c \
-       logging/log_manager.h \
-       $(NULL)
-
 LOG_DAEMON_SOURCES = \
        logging/log_daemon.h \
        logging/log_daemon.c \
@@ -50,22 +45,6 @@ OPENRC_INIT_FILES_IN += \
        logging/virtlogd.init.in \
        $(NULL)
 
-noinst_LTLIBRARIES += libvirt_driver_log.la
-
-libvirt_la_BUILT_LIBADD += libvirt_driver_log.la
-libvirt_driver_log_la_SOURCES = \
-       $(LOG_DRIVER_SOURCES) \
-       $(NULL)
-nodist_libvirt_driver_log_la_SOURCES = \
-       $(LOG_PROTOCOL_GENERATED) \
-       $(NULL)
-libvirt_driver_log_la_CFLAGS = \
-       -I$(builddir)/logging \
-       -I$(builddir)/rpc \
-       $(AM_CFLAGS) \
-       $(XDR_CFLAGS) \
-       $(NULL)
-
 if WITH_LIBVIRTD
 sbin_PROGRAMS += virtlogd
 

diff --git a/src/logging/meson.build b/src/logging/meson.build
new file mode 100644 (file)
index 0000000..a9c30ef
--- /dev/null
+++ b/src/logging/meson.build
@@ -0,0 +1,38 @@
+log_driver_sources = [
+  'log_manager.c',
+]
+
+log_protocol = 'log_protocol.x'
+
+log_protocol_generated = []
+
+log_protocol_generated += custom_target(
+  'log_protocol.h',
+  input: log_protocol,
+  output: 'log_protocol.h',
+  command: [
+    genprotocol_prog, rpcgen_prog, '-h', '@INPUT@', '@OUTPUT@'
+  ],
+)
+
+log_protocol_generated += custom_target(
+  'log_protocol.c',
+  input: log_protocol,
+  output: 'log_protocol.c',
+  command: [
+    genprotocol_prog, rpcgen_prog, '-c', '@INPUT@', '@OUTPUT@'
+  ],
+)
+
+log_driver_lib = static_library(
+  'virt_log_driver',
+  [
+    log_driver_sources,
+    log_protocol_generated,
+  ],
+  dependencies: [
+    rpc_dep,
+    src_dep,
+    xdr_dep,
+  ],
+)

diff --git a/src/meson.build b/src/meson.build
index 6127c5af5adbad4eeb10312a971ba5b47afde9a2..a9edf67e2542c5d857a4e316b6d7c7a6e55a22c1 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -97,6 +97,7 @@ subdir('vmx')
 
 subdir('admin')
 subdir('locking')
+subdir('logging')
 
 subdir('esx')
 subdir('hyperv')