[totem] build: Add a dependency on generated libbacon files
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] build: Add a dependency on generated libbacon files
- Date: Thu, 10 Aug 2017 13:13:02 +0000 (UTC)
commit 2903ddf56cf432459516dadbda90ab84b77025c8
Author: Emmanuele Bassi <ebassi gnome org>
Date: Thu Aug 10 14:09:25 2017 +0100
build: Add a dependency on generated libbacon files
In cases of large parallelism, the totem files may be compiled before
the libbacon headers are generated. The declare_dependency() object can
be instructed to transfer that dependency not just on the library to
link with, but also to the sources that need to exist in order to build
other targets that depend on those sources.
src/backend/meson.build | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/src/backend/meson.build b/src/backend/meson.build
index 4b0de0e..28c8e12 100644
--- a/src/backend/meson.build
+++ b/src/backend/meson.build
@@ -45,7 +45,9 @@ sources = files(
enums = 'bacon-video-widget-enums'
enums_header = files('bacon-video-widget.h')
-sources += gnome.mkenums(
+libbacon_gen_sources = []
+
+libbacon_gen_sources += gnome.mkenums(
enums + '.h',
sources: enums_header,
fhead: '#ifndef BVW_ENUMS_H\n#define BVW_ENUMS_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n',
@@ -54,7 +56,7 @@ sources += gnome.mkenums(
ftail: 'G_END_DECLS\n\n#endif /* !BVW_ENUMS_H */'
)
-sources += gnome.mkenums(
+libbacon_gen_sources += gnome.mkenums(
enums + '.c',
sources: enums_header,
fhead: '#include "bacon-video-widget.h"\n#include "bacon-video-widget-enums.h"',
@@ -93,7 +95,7 @@ libbacon_video_widget_cflags = common_flags + warn_flags + [
libbacon_video_widget = static_library(
'baconvideowidget',
- sources: sources,
+ sources: sources + libbacon_gen_sources,
include_directories: libbacon_video_widget_incs,
dependencies: libbacon_video_widget_deps,
c_args: libbacon_video_widget_cflags
@@ -102,7 +104,8 @@ libbacon_video_widget = static_library(
libbacon_video_widget_dep = declare_dependency(
link_with: libbacon_video_widget,
include_directories: backend_inc,
- dependencies: libbacon_video_widget_deps
+ dependencies: libbacon_video_widget_deps,
+ sources: libbacon_gen_sources
)
if have_easy_codec
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]