[rhythmbox/mesonjunk: 5/11] build: put all of backends/ in a single library
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox/mesonjunk: 5/11] build: put all of backends/ in a single library
- Date: Sun, 29 May 2022 07:50:35 +0000 (UTC)
commit 4518f9a3a0eccb016fc6ae870e7c1b8f4eab59f0
Author: Jonathan Matthew <jonathan d14n org>
Date: Tue May 24 23:09:58 2022 +1000
build: put all of backends/ in a single library
Neither half of this code is usable on its own, so it might as well be
one library.
backends/meson.build | 16 +++++++++-------
meson.build | 2 +-
shell/meson.build | 4 +---
3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/backends/meson.build b/backends/meson.build
index 0f0ec6bbd..c4dd11618 100644
--- a/backends/meson.build
+++ b/backends/meson.build
@@ -1,7 +1,3 @@
-backends_inc = include_directories('.')
-
-subdir('gstreamer')
-
backends_headers = files(
'rb-encoder.h',
'rb-player.h',
@@ -16,6 +12,11 @@ backends_sources = files(
'rb-player.c',
'rb-player-gst-filter.c',
'rb-player-gst-tee.c',
+
+ 'gstreamer/rb-encoder-gst.c',
+ 'gstreamer/rb-player-gst-helper.c',
+ 'gstreamer/rb-player-gst.c',
+ 'gstreamer/rb-player-gst-xfade.c',
)
backends_c_args = [
@@ -23,16 +24,17 @@ backends_c_args = [
'-DG_LOG_DOMAIN="Rhythmbox"',
]
-backends_dependencies = [gstreamer_backend_dependencies]
+backends_dependencies = [gstreamer_base, gstreamer_controller, gstreamer_plugins_base, gstreamer_tag]
rbbackends_lib = static_library('rbbackends',
backends_sources,
- dependencies: [librb_dep, rbbackendsgstreamer_dep],
+ dependencies: [backends_dependencies, librb_dep, rhythmdb_dep],
c_args: backends_c_args,
+ include_directories: backendsinc,
)
rbbackends_dep = declare_dependency(
link_with: rbbackends_lib,
dependencies: backends_dependencies,
- include_directories: include_directories('.'),
+ include_directories: backendsinc,
)
diff --git a/meson.build b/meson.build
index 107a2265e..de4863841 100644
--- a/meson.build
+++ b/meson.build
@@ -281,7 +281,7 @@ libinc = include_directories('lib')
mpidinc = include_directories('lib/libmediaplayerid')
metadatainc = include_directories('metadata')
rhythmdbinc = include_directories('rhythmdb')
-backendsinc = include_directories('backends')
+backendsinc = include_directories('backends', 'backends/gstreamer')
pluginsinc = include_directories('plugins')
podcastinc = include_directories('podcast')
shellinc = include_directories('shell')
diff --git a/shell/meson.build b/shell/meson.build
index 1a9eb7b9b..77b52a87d 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -108,8 +108,7 @@ librhythmbox_core = shared_library('rhythmbox-core',
rhythmbox_core_dep = declare_dependency(
link_with: librhythmbox_core,
dependencies: [mpid_dependencies, lib_dependencies, rhythmdb_dependencies,
- gstreamer_backend_dependencies, backends_dependencies,
- podcast_dependencies, widgets_dependencies, sources_dependencies],
+ backends_dependencies, podcast_dependencies, widgets_dependencies, sources_dependencies],
include_directories: rhythmbox_core_include_directories,
)
@@ -119,7 +118,6 @@ rb_gir = gnome.generate_gir(librhythmbox_core,
extra_args: [ '--accept-unprefixed'],
sources: lib_headers + lib_sources +
backends_sources + backends_headers +
- gstreamer_backend_sources + gstreamer_backend_headers +
metadata_sources + metadata_headers +
podcast_sources + podcast_headers +
rhythmdb_sources + rhythmdb_headers +
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]