summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2020-05-18 17:46:55 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-05-26 10:15:21 +0200
commit3ca9d7282515c688f79aa7d6db34eaf33804096f (patch)
tree302b8aec11f4aeed23dd43397180b294311317af
parent59127058afd3f1259a0dfc438ca387fa02b72ccc (diff)
build: lib: harmonize the use of package_c_args in all libs
Add it to subprojects which are not using it and remove and old ELEMENTARY_BUILD define we no longer use. This allows us to have a central place in the main meson.build file to set this variable. Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de> Reviewed-by: Vincent Torri <vincent.torri@gmail.com> Reviewed-by: João Paulo Taylor Ienczak Zanette <joao.tiz@expertisesolutions.com.br> Differential Revision: https://phab.enlightenment.org/D11854
-rw-r--r--src/lib/ecore_audio/meson.build1
-rw-r--r--src/lib/ecore_evas/meson.build1
-rw-r--r--src/lib/ecore_file/meson.build1
-rw-r--r--src/lib/ecore_input/meson.build1
-rw-r--r--src/lib/ecore_input_evas/meson.build1
-rw-r--r--src/lib/ecore_ipc/meson.build1
-rw-r--r--src/lib/ector/meson.build1
-rw-r--r--src/lib/eet/meson.build1
-rw-r--r--src/lib/efl/meson.build1
-rw-r--r--src/lib/eina/meson.build1
-rw-r--r--src/lib/eldbus/meson.build1
-rw-r--r--src/lib/elementary/meson.build3
-rw-r--r--src/lib/emile/meson.build1
-rw-r--r--src/lib/emotion/meson.build7
-rw-r--r--src/lib/eo/meson.build3
-rw-r--r--src/lib/evas/meson.build2
-rw-r--r--src/lib/evil/meson.build1
17 files changed, 22 insertions, 6 deletions
diff --git a/src/lib/ecore_audio/meson.build b/src/lib/ecore_audio/meson.build
index c03eb3e663..68a5c606c2 100644
--- a/src/lib/ecore_audio/meson.build
+++ b/src/lib/ecore_audio/meson.build
@@ -79,6 +79,7 @@ endif
79 79
80ecore_audio_lib = library('ecore_audio', 80ecore_audio_lib = library('ecore_audio',
81 ecore_audio_src, pub_eo_file_target, 81 ecore_audio_src, pub_eo_file_target,
82 c_args : package_c_args,
82 dependencies: ecore_audio_pub_deps + [m] + ecore_audio_deps, 83 dependencies: ecore_audio_pub_deps + [m] + ecore_audio_deps,
83 include_directories : config_dir, 84 include_directories : config_dir,
84 install: true, 85 install: true,
diff --git a/src/lib/ecore_evas/meson.build b/src/lib/ecore_evas/meson.build
index 890e3c42b3..c673097dbc 100644
--- a/src/lib/ecore_evas/meson.build
+++ b/src/lib/ecore_evas/meson.build
@@ -30,6 +30,7 @@ ecore_evas_src = [
30 30
31ecore_evas_lib = library('ecore_evas', 31ecore_evas_lib = library('ecore_evas',
32 ecore_evas_src, pub_eo_file_target, 32 ecore_evas_src, pub_eo_file_target,
33 c_args : package_c_args,
33 dependencies: [ecore_evas_deps, buildsystem], 34 dependencies: [ecore_evas_deps, buildsystem],
34 include_directories : config_dir, 35 include_directories : config_dir,
35 install: true, 36 install: true,
diff --git a/src/lib/ecore_file/meson.build b/src/lib/ecore_file/meson.build
index 727c3d372c..9bbee467d6 100644
--- a/src/lib/ecore_file/meson.build
+++ b/src/lib/ecore_file/meson.build
@@ -22,6 +22,7 @@ ecore_file_header_src = ['Ecore_File.h']
22 22
23ecore_file_lib = library('ecore_file', 23ecore_file_lib = library('ecore_file',
24 ecore_file_src, 24 ecore_file_src,
25 c_args : package_c_args,
25 dependencies: ecore_file_deps + ecore_file_pub_deps + ecore_file_deps, 26 dependencies: ecore_file_deps + ecore_file_pub_deps + ecore_file_deps,
26 include_directories : config_dir + [include_directories(join_paths('..','..'))], 27 include_directories : config_dir + [include_directories(join_paths('..','..'))],
27 install: true, 28 install: true,
diff --git a/src/lib/ecore_input/meson.build b/src/lib/ecore_input/meson.build
index c57ec4e04c..d985eb58e8 100644
--- a/src/lib/ecore_input/meson.build
+++ b/src/lib/ecore_input/meson.build
@@ -20,6 +20,7 @@ endif
20 20
21ecore_input_lib = library('ecore_input', 21ecore_input_lib = library('ecore_input',
22 ecore_input_src, pub_eo_file_target, 22 ecore_input_src, pub_eo_file_target,
23 c_args : package_c_args,
23 dependencies: ecore_input_pub_deps + ecore_input_deps, 24 dependencies: ecore_input_pub_deps + ecore_input_deps,
24 include_directories : config_dir, 25 include_directories : config_dir,
25 install: true, 26 install: true,
diff --git a/src/lib/ecore_input_evas/meson.build b/src/lib/ecore_input_evas/meson.build
index 8b48142f7d..ee2516bfbf 100644
--- a/src/lib/ecore_input_evas/meson.build
+++ b/src/lib/ecore_input_evas/meson.build
@@ -14,6 +14,7 @@ ecore_input_evas_src = [
14 14
15ecore_input_evas_lib = library('ecore_input_evas', 15ecore_input_evas_lib = library('ecore_input_evas',
16 ecore_input_evas_src, pub_eo_file_target, 16 ecore_input_evas_src, pub_eo_file_target,
17 c_args : package_c_args,
17 dependencies: ecore_input_evas_pub_deps + ecore_input_evas_deps, 18 dependencies: ecore_input_evas_pub_deps + ecore_input_evas_deps,
18 include_directories : config_dir, 19 include_directories : config_dir,
19 install: true, 20 install: true,
diff --git a/src/lib/ecore_ipc/meson.build b/src/lib/ecore_ipc/meson.build
index dbc95b0531..e34caa3619 100644
--- a/src/lib/ecore_ipc/meson.build
+++ b/src/lib/ecore_ipc/meson.build
@@ -12,6 +12,7 @@ ecore_ipc_src = [
12 12
13ecore_ipc_lib = library('ecore_ipc', 13ecore_ipc_lib = library('ecore_ipc',
14 ecore_ipc_src, pub_eo_file_target, 14 ecore_ipc_src, pub_eo_file_target,
15 c_args : package_c_args,
15 dependencies: ecore_ipc_deps + ecore_ipc_pub_deps, 16 dependencies: ecore_ipc_deps + ecore_ipc_pub_deps,
16 include_directories : config_dir, 17 include_directories : config_dir,
17 install: true, 18 install: true,
diff --git a/src/lib/ector/meson.build b/src/lib/ector/meson.build
index 49fc5a477f..628c83f384 100644
--- a/src/lib/ector/meson.build
+++ b/src/lib/ector/meson.build
@@ -82,6 +82,7 @@ subdir('software')
82 82
83ector_lib = library('ector', 83ector_lib = library('ector',
84 ector_src, pub_eo_file_target, 84 ector_src, pub_eo_file_target,
85 c_args : package_c_args,
85 dependencies: ector_pub_deps + [triangulator, freetype, draw, m] + ector_deps, 86 dependencies: ector_pub_deps + [triangulator, freetype, draw, m] + ector_deps,
86 include_directories : config_dir, 87 include_directories : config_dir,
87 install: true, 88 install: true,
diff --git a/src/lib/eet/meson.build b/src/lib/eet/meson.build
index 8ebdb48dd6..2dec5335c0 100644
--- a/src/lib/eet/meson.build
+++ b/src/lib/eet/meson.build
@@ -20,6 +20,7 @@ eet_src = [
20 20
21eet_lib = library('eet', 21eet_lib = library('eet',
22 eet_src, pub_eo_file_target, 22 eet_src, pub_eo_file_target,
23 c_args : package_c_args,
23 dependencies: eet_deps + eet_pub_deps, 24 dependencies: eet_deps + eet_pub_deps,
24 include_directories : config_dir, 25 include_directories : config_dir,
25 install: true, 26 install: true,
diff --git a/src/lib/efl/meson.build b/src/lib/efl/meson.build
index d5805be9b3..326e34eafd 100644
--- a/src/lib/efl/meson.build
+++ b/src/lib/efl/meson.build
@@ -13,6 +13,7 @@ package_header_subdirs += 'interfaces'
13 13
14efl_lib = library('efl', 14efl_lib = library('efl',
15 efl_src, pub_eo_file_target, 15 efl_src, pub_eo_file_target,
16 c_args : package_c_args,
16 dependencies: [eina, eo, m], 17 dependencies: [eina, eo, m],
17 install: true, 18 install: true,
18 version : meson.project_version() 19 version : meson.project_version()
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index ce7cfe84f1..53e1b6120b 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -362,6 +362,7 @@ endif
362execinfo = cc.find_library('execinfo', required: false) 362execinfo = cc.find_library('execinfo', required: false)
363 363
364eina_lib = library('eina', sources, 364eina_lib = library('eina', sources,
365 c_args : package_c_args,
365 include_directories : config_dir, 366 include_directories : config_dir,
366 dependencies: [m, rt, dl, execinfo, iconv, eina_deps, thread_dep, eina_mem_pools, evil], 367 dependencies: [m, rt, dl, execinfo, iconv, eina_deps, thread_dep, eina_mem_pools, evil],
367 install: true, 368 install: true,
diff --git a/src/lib/eldbus/meson.build b/src/lib/eldbus/meson.build
index 054273acf8..a58be32b1b 100644
--- a/src/lib/eldbus/meson.build
+++ b/src/lib/eldbus/meson.build
@@ -96,6 +96,7 @@ eldbus_deps += dependency('dbus-1')
96 96
97eldbus_lib = library('eldbus', 97eldbus_lib = library('eldbus',
98 eldbus_src, pub_eo_file_target, 98 eldbus_src, pub_eo_file_target,
99 c_args : package_c_args,
99 dependencies: eldbus_pub_deps + eldbus_deps, 100 dependencies: eldbus_pub_deps + eldbus_deps,
100 include_directories : config_dir, 101 include_directories : config_dir,
101 install: true, 102 install: true,
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index eb5c9e674f..f2e7ed96fb 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -1008,7 +1008,8 @@ c = configure_file(
1008 install_dir : dir_package_include, 1008 install_dir : dir_package_include,
1009 configuration: elm_options) 1009 configuration: elm_options)
1010 1010
1011elm_package_c_args = package_c_args + ['-DELEMENTARY_BUILD=1'] 1011# Save in extra variable here to pass to edje_external
1012elm_package_c_args = package_c_args
1012 1013
1013elementary_lib = library('elementary', 1014elementary_lib = library('elementary',
1014 elementary_src, pub_eo_file_target, priv_eo_file_target, c, embed_config, 1015 elementary_src, pub_eo_file_target, priv_eo_file_target, c, embed_config,
diff --git a/src/lib/emile/meson.build b/src/lib/emile/meson.build
index 4ae888c42a..d8734cd1f2 100644
--- a/src/lib/emile/meson.build
+++ b/src/lib/emile/meson.build
@@ -25,6 +25,7 @@ endif
25 25
26emile_lib = library('emile', 26emile_lib = library('emile',
27 emile_src, 27 emile_src,
28 c_args : package_c_args,
28 include_directories: config_dir, 29 include_directories: config_dir,
29 dependencies: emile_pub_deps + emile_deps + [lz4, rg_etc, m], 30 dependencies: emile_pub_deps + emile_deps + [lz4, rg_etc, m],
30 install: true, 31 install: true,
diff --git a/src/lib/emotion/meson.build b/src/lib/emotion/meson.build
index 6f2717dfa6..e779a39248 100644
--- a/src/lib/emotion/meson.build
+++ b/src/lib/emotion/meson.build
@@ -44,17 +44,18 @@ if get_option('eeze') == true
44 emotion_deps += [eeze] 44 emotion_deps += [eeze]
45endif 45endif
46 46
47# Save in extra variable here to pass to edje_externa
48emotion_package_c_args = package_c_args
49
47emotion_lib = library('emotion', 50emotion_lib = library('emotion',
48 emotion_src, pub_eo_file_target, priv_eo_file_target, 51 emotion_src, pub_eo_file_target, priv_eo_file_target,
49 dependencies: emotion_deps + emotion_pub_deps, 52 dependencies: emotion_deps + emotion_pub_deps,
50 include_directories : config_dir + [include_directories('.')], 53 include_directories : config_dir + [include_directories('.')],
51 install: true, 54 install: true,
52 c_args : package_c_args, 55 c_args : emotion_package_c_args,
53 version : meson.project_version() 56 version : meson.project_version()
54) 57)
55 58
56emotion_package_c_args = package_c_args
57
58emotion = declare_dependency( 59emotion = declare_dependency(
59 include_directories: [include_directories('.')], 60 include_directories: [include_directories('.')],
60 link_with: emotion_lib, 61 link_with: emotion_lib,
diff --git a/src/lib/eo/meson.build b/src/lib/eo/meson.build
index 83eedb0de7..1360276e60 100644
--- a/src/lib/eo/meson.build
+++ b/src/lib/eo/meson.build
@@ -60,6 +60,7 @@ eolian_include_directories += ['-I', meson.current_source_dir()]
60 60
61eo_lib = library('eo', 61eo_lib = library('eo',
62 eo_src, pub_eo_file_target, 62 eo_src, pub_eo_file_target,
63 c_args : package_c_args,
63 dependencies: [eina, valgrind, dl, execinfo], 64 dependencies: [eina, valgrind, dl, execinfo],
64 install: true, 65 install: true,
65 version : meson.project_version() 66 version : meson.project_version()
@@ -67,9 +68,9 @@ eo_lib = library('eo',
67 68
68eo_lib_dbg = library('eo_dbg', 69eo_lib_dbg = library('eo_dbg',
69 eo_src, pub_eo_file_target, 70 eo_src, pub_eo_file_target,
71 c_args : package_c_args + [ '-DEO_DEBUG' ],
70 dependencies: [eina, valgrind, dl, execinfo], 72 dependencies: [eina, valgrind, dl, execinfo],
71 install: true, 73 install: true,
72 c_args : '-DEO_DEBUG',
73 version : meson.project_version() 74 version : meson.project_version()
74) 75)
75 76
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index a83a5e73e0..8b9c15f742 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -285,7 +285,7 @@ evas_lib = library('evas',
285 dependencies: [evas_deps, m, draw, valgrind, libunibreak, evas_static_list], 285 dependencies: [evas_deps, m, draw, valgrind, libunibreak, evas_static_list],
286 link_with: evas_link, 286 link_with: evas_link,
287 install: true, 287 install: true,
288 c_args : '-DPACKAGE_DATA_DIR="'+join_paths(dir_data, 'evas')+'"', 288 c_args : package_c_args,
289 version : meson.project_version() 289 version : meson.project_version()
290) 290)
291 291
diff --git a/src/lib/evil/meson.build b/src/lib/evil/meson.build
index 4769e58054..823b724a91 100644
--- a/src/lib/evil/meson.build
+++ b/src/lib/evil/meson.build
@@ -24,6 +24,7 @@ if target_machine.system() == 'windows'
24 uuid = cc.find_library('uuid') 24 uuid = cc.find_library('uuid')
25 25
26 evil_lib = library('evil', evil_src, 26 evil_lib = library('evil', evil_src,
27 c_args : package_c_args,
27 dependencies : [psapi, ole32, ws2_32, secur32, uuid, regexp], 28 dependencies : [psapi, ole32, ws2_32, secur32, uuid, regexp],
28 include_directories : [config_dir], 29 include_directories : [config_dir],
29 install: true, 30 install: true,