summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-04-26 09:06:07 -0400
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-05-06 17:00:48 +0200
commiteeddb16b7666d984aad73396b1cfedbbcc6fe92e (patch)
treed359433b412815b2b1e5fd21cd2173e20c387a94
parent18ce3e8066f954bd32f2ba890e308def86c6a668 (diff)
meson: add intl to efreet all binary deps
this must be explicitly added for windows builds Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Differential Revision: https://phab.enlightenment.org/D8725
-rw-r--r--src/bin/efreet/meson.build10
-rw-r--r--src/tests/efreet/meson.build6
2 files changed, 10 insertions, 6 deletions
diff --git a/src/bin/efreet/meson.build b/src/bin/efreet/meson.build
index 4c7bf5e..27f0e39 100644
--- a/src/bin/efreet/meson.build
+++ b/src/bin/efreet/meson.build
@@ -11,14 +11,16 @@ config_h.set('STRICT_SPEC', '1')
11 11
12efreetd = executable('efreetd', 12efreetd = executable('efreetd',
13 efreetd_src, 13 efreetd_src,
14 dependencies: [efreet, ecore, ecore_ipc, ecore_file, eio], 14 dependencies: [efreet, ecore, ecore_ipc, ecore_file, eio, intl],
15 install: true, 15 install: true,
16 c_args : package_c_args, 16 c_args : package_c_args,
17) 17)
18 18
19efreet_bin_deps = [efreet, ecore, eet, ecore_file, intl]
20
19efreet_desktop_cache_create = executable('efreet_desktop_cache_create', 21efreet_desktop_cache_create = executable('efreet_desktop_cache_create',
20 'efreet_desktop_cache_create.c', 22 'efreet_desktop_cache_create.c',
21 dependencies: [efreet, ecore, eet, ecore_file], 23 dependencies: efreet_bin_deps,
22 install: true, 24 install: true,
23 install_dir : join_paths(dir_lib, 'efreet', version_name), 25 install_dir : join_paths(dir_lib, 'efreet', version_name),
24 c_args : package_c_args, 26 c_args : package_c_args,
@@ -26,7 +28,7 @@ efreet_desktop_cache_create = executable('efreet_desktop_cache_create',
26 28
27efreet_icon_cache_create = executable('efreet_icon_cache_create', 29efreet_icon_cache_create = executable('efreet_icon_cache_create',
28 'efreet_icon_cache_create.c', 30 'efreet_icon_cache_create.c',
29 dependencies: [efreet, ecore, eet, ecore_file], 31 dependencies: efreet_bin_deps,
30 install: true, 32 install: true,
31 install_dir : join_paths(dir_lib, 'efreet', version_name), 33 install_dir : join_paths(dir_lib, 'efreet', version_name),
32 c_args : package_c_args, 34 c_args : package_c_args,
@@ -34,7 +36,7 @@ efreet_icon_cache_create = executable('efreet_icon_cache_create',
34 36
35efreet_mime_cache_create = executable('efreet_mime_cache_create', 37efreet_mime_cache_create = executable('efreet_mime_cache_create',
36 'efreet_mime_cache_create.c', 38 'efreet_mime_cache_create.c',
37 dependencies: [efreet, ecore, eet, ecore_file], 39 dependencies: efreet_bin_deps,
38 install: true, 40 install: true,
39 install_dir : join_paths(dir_lib, 'efreet', version_name), 41 install_dir : join_paths(dir_lib, 'efreet', version_name),
40 c_args : package_c_args, 42 c_args : package_c_args,
diff --git a/src/tests/efreet/meson.build b/src/tests/efreet/meson.build
index 27ce1a0..4ce9156 100644
--- a/src/tests/efreet/meson.build
+++ b/src/tests/efreet/meson.build
@@ -31,9 +31,11 @@ efreet_test_src = [
31 'main.c' 31 'main.c'
32] 32]
33 33
34efreet_test_deps = [check, efreet, ecore, ecore_file, efreet_mime, intl]
35
34efreet_test = executable('efreet_test', 36efreet_test = executable('efreet_test',
35 efreet_test_src, 37 efreet_test_src,
36 dependencies: [check, efreet, ecore, ecore_file, efreet_mime], 38 dependencies: efreet_test_deps,
37 include_directories : config_dir, 39 include_directories : config_dir,
38 c_args : [ 40 c_args : [
39 package_c_args, 41 package_c_args,
@@ -54,7 +56,7 @@ additional_tests = [
54foreach additional_test : additional_tests 56foreach additional_test : additional_tests
55 efreet_tmp = executable(additional_test.underscorify(), 57 efreet_tmp = executable(additional_test.underscorify(),
56 additional_test+'.c', 58 additional_test+'.c',
57 dependencies: [check, efreet, ecore, eet, ecore_file, efreet_mime], 59 dependencies: [efreet_test_deps, eet],
58 include_directories : config_dir, 60 include_directories : config_dir,
59 c_args : [ 61 c_args : [
60 package_c_args, 62 package_c_args,