[gthumb] meson: fixed main executable dependencies
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] meson: fixed main executable dependencies
- Date: Mon, 16 Apr 2018 16:22:22 +0000 (UTC)
commit 5a3f461e71d917e7e3e0c0e4f76923934b880576
Author: Paolo Bacchilega <paobac src gnome org>
Date: Mon Oct 23 10:51:22 2017 +0200
meson: fixed main executable dependencies
gthumb/meson.build | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/gthumb/meson.build b/gthumb/meson.build
index 2736451..5e54987 100644
--- a/gthumb/meson.build
+++ b/gthumb/meson.build
@@ -273,7 +273,7 @@ source_files = files(
'zlib-utils.c'
)
-other_files = files(
+external_files = files(
'gnome-desktop-thumbnail.c',
'gnome-thumbnail-pixbuf-utils.c'
)
@@ -288,26 +288,28 @@ gthumb_exe = executable('gthumb',
marshal_files,
enum_files,
source_files,
- other_files,
+ external_files,
gresource_files
],
dependencies : [
common_deps,
jpeg_deps,
- exiv2_dep,
- clutter_deps,
- gstreamer_deps,
+ authors_dep,
+ use_exiv2 ? exiv2_dep : [],
+ use_clutter ? clutter_deps : [],
+ use_gstreamer ? gstreamer_deps : [],
use_libchamplain ? libchamplain_deps : [],
- lcms2_dep,
- colord_dep,
+ use_lcms2 ? lcms2_dep : [],
+ use_colord ? colord_dep : [],
use_libtiff ? tiff_deps : [],
use_libwebp ? libwebp_dep : [],
use_libraw ? libraw_dep : [],
use_librsvg ? librsvg_dep : [],
- webkit2_dep,
- libsecret_dep,
- libbrasero_dep,
- authors_dep
+ with_webservices ? webkit2_dep : [],
+ with_webservices ? libsoup_dep : [],
+ with_webservices ? libjson_glib_dep : [],
+ use_libsecret ? libsecret_dep : [],
+ use_libbrasero ? libbrasero_dep : []
],
include_directories : [ config_inc, gthumb_inc ],
c_args : c_args,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]