summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRico Tzschichholz <ricotz@ubuntu.com>2021-02-21 19:56:39 +0100
committerJens Georg <mail@jensge.org>2021-09-15 20:42:14 +0200
commitef097ab61b00b72f0e1c9b2b4c31277b618c1df0 (patch)
treed380c3ffd0d10ddc5f32e284fe73c453630874b5
parent5f0dade023b88a58922e8352e310f13e1e8ea68b (diff)
downloadrygel-ef097ab61b00b72f0e1c9b2b4c31277b618c1df0.tar.gz
meson: Improve depends of typelib targets to avoid possible races
-rw-r--r--src/librygel-core/meson.build2
-rw-r--r--src/librygel-renderer-gst/meson.build2
-rw-r--r--src/librygel-renderer/meson.build2
-rw-r--r--src/librygel-server/meson.build2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/librygel-core/meson.build b/src/librygel-core/meson.build
index 191c57f6..fd43bebe 100644
--- a/src/librygel-core/meson.build
+++ b/src/librygel-core/meson.build
@@ -72,7 +72,7 @@ core_gir = custom_target('RygelCore-2.6.gir',
custom_target('RygelCore-2.6.typelib',
command: [g_ir_compiler, '--output', '@OUTPUT@', join_paths(meson.current_build_dir(), 'RygelCore-2.6.gir')],
output: 'RygelCore-2.6.typelib',
- depends: core_gir,
+ depends: [ core_lib, core_gir ],
install: true,
install_dir: typelib_dir)
endif
diff --git a/src/librygel-renderer-gst/meson.build b/src/librygel-renderer-gst/meson.build
index 45f68cde..ad98a3a7 100644
--- a/src/librygel-renderer-gst/meson.build
+++ b/src/librygel-renderer-gst/meson.build
@@ -38,7 +38,7 @@ custom_target('RygelRendererGst-2.6.typelib',
'--includedir', renderer_girdir,
join_paths(meson.current_build_dir(), 'RygelRendererGst-2.6.gir')],
output: 'RygelRendererGst-2.6.typelib',
- depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir],
+ depends: [renderer_gst_lib, renderer_lib, renderer_gst_gir, renderer_gir],
install: true,
install_dir: typelib_dir)
endif
diff --git a/src/librygel-renderer/meson.build b/src/librygel-renderer/meson.build
index 742c50f3..5f401527 100644
--- a/src/librygel-renderer/meson.build
+++ b/src/librygel-renderer/meson.build
@@ -45,7 +45,7 @@ custom_target('RygelRenderer-2.6.typelib',
'--includedir', core_girdir,
join_paths(meson.current_build_dir(), 'RygelRenderer-2.6.gir')],
output: 'RygelRenderer-2.6.typelib',
- depends: renderer_gir,
+ depends: [ renderer_lib, renderer_gir, core_gir ],
install: true,
install_dir: typelib_dir)
endif
diff --git a/src/librygel-server/meson.build b/src/librygel-server/meson.build
index 5f5a1f06..a3bd77d9 100644
--- a/src/librygel-server/meson.build
+++ b/src/librygel-server/meson.build
@@ -124,7 +124,7 @@ custom_target('RygelServer-2.6.typelib',
'--includedir', core_girdir,
join_paths(meson.current_build_dir(), 'RygelServer-2.6.gir')],
output: 'RygelServer-2.6.typelib',
- depends: server_gir,
+ depends: [ server_lib, server_gir, core_gir ],
install: true,
install_dir: typelib_dir)