From 5ef29c424d67f2b3a09449502dcdae5da18c1bae Mon Sep 17 00:00:00 2001
From: Max Kellermann <max.kellermann@gmail.com>
Date: Tue, 7 Mar 2023 11:50:05 +0100
Subject: [PATCH] output/meson.build: add liboutput_registry.a
---
src/output/meson.build | 20 +++++++++++++++++---
test/meson.build | 2 +-
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/output/meson.build b/src/output/meson.build
index 20bdb0f66..96af6b8c5 100644
--- a/src/output/meson.build
+++ b/src/output/meson.build
@@ -18,11 +18,26 @@ output_api_dep = declare_dependency(
subdir('plugins')
+output_registry = static_library(
+ 'output_registry',
+ 'Registry.cxx',
+ include_directories: inc,
+ dependencies: [
+ fmt_dep,
+ ],
+)
+
+output_registry_dep = declare_dependency(
+ link_with: output_registry,
+ dependencies: [
+ output_plugins_dep,
+ ],
+)
+
output_glue = static_library(
'output_glue',
'Defaults.cxx',
'Filtered.cxx',
- 'Registry.cxx',
'MultipleOutputs.cxx',
'SharedPipeConsumer.cxx',
'Source.cxx',
@@ -37,6 +52,7 @@ output_glue = static_library(
include_directories: inc,
dependencies: [
fmt_dep,
+ output_registry_dep,
],
)
@@ -45,9 +61,7 @@ output_glue_dep = declare_dependency(
dependencies: [
filter_glue_dep,
mixer_plugins_dep,
- output_plugins_dep,
],
)
-
configure_file(output: 'Features.h', configuration: output_features)
diff --git a/test/meson.build b/test/meson.build
index 6942e2ce7..77b252cd2 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -615,7 +615,7 @@ executable(
'run_output.cxx',
include_directories: inc,
dependencies: [
- output_glue_dep,
+ output_registry_dep,
encoder_glue_dep,
event_dep,
cmdline_dep,