diff options
author | Stefan Schmidt <s.schmidt@samsung.com> | 2020-05-18 17:46:55 +0200 |
---|---|---|
committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2020-05-26 10:15:21 +0200 |
commit | 3ca9d7282515c688f79aa7d6db34eaf33804096f (patch) | |
tree | 302b8aec11f4aeed23dd43397180b294311317af | |
parent | 59127058afd3f1259a0dfc438ca387fa02b72ccc (diff) | |
download | efl-3ca9d7282515c688f79aa7d6db34eaf33804096f.tar.gz |
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.build | 1 | ||||
-rw-r--r-- | src/lib/ecore_evas/meson.build | 1 | ||||
-rw-r--r-- | src/lib/ecore_file/meson.build | 1 | ||||
-rw-r--r-- | src/lib/ecore_input/meson.build | 1 | ||||
-rw-r--r-- | src/lib/ecore_input_evas/meson.build | 1 | ||||
-rw-r--r-- | src/lib/ecore_ipc/meson.build | 1 | ||||
-rw-r--r-- | src/lib/ector/meson.build | 1 | ||||
-rw-r--r-- | src/lib/eet/meson.build | 1 | ||||
-rw-r--r-- | src/lib/efl/meson.build | 1 | ||||
-rw-r--r-- | src/lib/eina/meson.build | 1 | ||||
-rw-r--r-- | src/lib/eldbus/meson.build | 1 | ||||
-rw-r--r-- | src/lib/elementary/meson.build | 3 | ||||
-rw-r--r-- | src/lib/emile/meson.build | 1 | ||||
-rw-r--r-- | src/lib/emotion/meson.build | 7 | ||||
-rw-r--r-- | src/lib/eo/meson.build | 3 | ||||
-rw-r--r-- | src/lib/evas/meson.build | 2 | ||||
-rw-r--r-- | src/lib/evil/meson.build | 1 |
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 ecore_audio_lib = library('ecore_audio', ecore_audio_src, pub_eo_file_target, + c_args : package_c_args, dependencies: ecore_audio_pub_deps + [m] + ecore_audio_deps, include_directories : config_dir, 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 = [ ecore_evas_lib = library('ecore_evas', ecore_evas_src, pub_eo_file_target, + c_args : package_c_args, dependencies: [ecore_evas_deps, buildsystem], include_directories : config_dir, 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'] ecore_file_lib = library('ecore_file', ecore_file_src, + c_args : package_c_args, dependencies: ecore_file_deps + ecore_file_pub_deps + ecore_file_deps, include_directories : config_dir + [include_directories(join_paths('..','..'))], 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 ecore_input_lib = library('ecore_input', ecore_input_src, pub_eo_file_target, + c_args : package_c_args, dependencies: ecore_input_pub_deps + ecore_input_deps, include_directories : config_dir, 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 = [ ecore_input_evas_lib = library('ecore_input_evas', ecore_input_evas_src, pub_eo_file_target, + c_args : package_c_args, dependencies: ecore_input_evas_pub_deps + ecore_input_evas_deps, include_directories : config_dir, 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 = [ ecore_ipc_lib = library('ecore_ipc', ecore_ipc_src, pub_eo_file_target, + c_args : package_c_args, dependencies: ecore_ipc_deps + ecore_ipc_pub_deps, include_directories : config_dir, 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') ector_lib = library('ector', ector_src, pub_eo_file_target, + c_args : package_c_args, dependencies: ector_pub_deps + [triangulator, freetype, draw, m] + ector_deps, include_directories : config_dir, 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 = [ eet_lib = library('eet', eet_src, pub_eo_file_target, + c_args : package_c_args, dependencies: eet_deps + eet_pub_deps, include_directories : config_dir, 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' efl_lib = library('efl', efl_src, pub_eo_file_target, + c_args : package_c_args, dependencies: [eina, eo, m], install: true, 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 execinfo = cc.find_library('execinfo', required: false) eina_lib = library('eina', sources, + c_args : package_c_args, include_directories : config_dir, dependencies: [m, rt, dl, execinfo, iconv, eina_deps, thread_dep, eina_mem_pools, evil], 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') eldbus_lib = library('eldbus', eldbus_src, pub_eo_file_target, + c_args : package_c_args, dependencies: eldbus_pub_deps + eldbus_deps, include_directories : config_dir, 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( install_dir : dir_package_include, configuration: elm_options) -elm_package_c_args = package_c_args + ['-DELEMENTARY_BUILD=1'] +# Save in extra variable here to pass to edje_external +elm_package_c_args = package_c_args elementary_lib = library('elementary', 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 emile_lib = library('emile', emile_src, + c_args : package_c_args, include_directories: config_dir, dependencies: emile_pub_deps + emile_deps + [lz4, rg_etc, m], 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 emotion_deps += [eeze] endif +# Save in extra variable here to pass to edje_externa +emotion_package_c_args = package_c_args + emotion_lib = library('emotion', emotion_src, pub_eo_file_target, priv_eo_file_target, dependencies: emotion_deps + emotion_pub_deps, include_directories : config_dir + [include_directories('.')], install: true, - c_args : package_c_args, + c_args : emotion_package_c_args, version : meson.project_version() ) -emotion_package_c_args = package_c_args - emotion = declare_dependency( include_directories: [include_directories('.')], 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()] eo_lib = library('eo', eo_src, pub_eo_file_target, + c_args : package_c_args, dependencies: [eina, valgrind, dl, execinfo], install: true, version : meson.project_version() @@ -67,9 +68,9 @@ eo_lib = library('eo', eo_lib_dbg = library('eo_dbg', eo_src, pub_eo_file_target, + c_args : package_c_args + [ '-DEO_DEBUG' ], dependencies: [eina, valgrind, dl, execinfo], install: true, - c_args : '-DEO_DEBUG', version : meson.project_version() ) 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', dependencies: [evas_deps, m, draw, valgrind, libunibreak, evas_static_list], link_with: evas_link, install: true, - c_args : '-DPACKAGE_DATA_DIR="'+join_paths(dir_data, 'evas')+'"', + c_args : package_c_args, version : meson.project_version() ) 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' uuid = cc.find_library('uuid') evil_lib = library('evil', evil_src, + c_args : package_c_args, dependencies : [psapi, ole32, ws2_32, secur32, uuid, regexp], include_directories : [config_dir], install: true, |