From 179a472ee4895533ad6ba2e048f17cfe8c67b4a3 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Mon, 18 May 2020 17:46:55 +0200 Subject: [PATCH] build: lib: harmonize the use of package_c_args in all libs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Vincent Torri Reviewed-by: João Paulo Taylor Ienczak Zanette Differential Revision: https://phab.enlightenment.org/D11854 --- src/lib/ecore_audio/meson.build | 1 + src/lib/ecore_evas/meson.build | 1 + src/lib/ecore_file/meson.build | 1 + src/lib/ecore_input/meson.build | 1 + src/lib/ecore_input_evas/meson.build | 1 + src/lib/ecore_ipc/meson.build | 1 + src/lib/ector/meson.build | 1 + src/lib/eet/meson.build | 1 + src/lib/efl/meson.build | 1 + src/lib/eina/meson.build | 1 + src/lib/eldbus/meson.build | 1 + src/lib/elementary/meson.build | 3 ++- src/lib/emile/meson.build | 1 + src/lib/emotion/meson.build | 7 ++++--- src/lib/eo/meson.build | 3 ++- src/lib/evas/meson.build | 2 +- 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 a59ffab..ed4134a 100644 --- a/src/lib/ecore_audio/meson.build +++ b/src/lib/ecore_audio/meson.build @@ -93,6 +93,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 890e3c4..c673097 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 727c3d3..9bbee46 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 c57ec4e..d985eb5 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 8b48142..ee2516b 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 dbc95b0..e34caa3 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 49fc5a4..628c83f 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 8ebdb48..2dec533 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 d5805be..326e34e 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 0d5c177..9a5a1ea 100644 --- a/src/lib/eina/meson.build +++ b/src/lib/eina/meson.build @@ -369,6 +369,7 @@ if (dlog.found()) endif 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, dlog], install: true, diff --git a/src/lib/eldbus/meson.build b/src/lib/eldbus/meson.build index 054273a..a58be32 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 6014e46..f5d58c2 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -1118,7 +1118,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 4ae888c..d8734cd 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 6f2717d..e779a39 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 83eedb0..1360276 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 fba389a..12abccd 100644 --- a/src/lib/evas/meson.build +++ b/src/lib/evas/meson.build @@ -293,7 +293,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 4769e58..823b724 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, -- 2.7.4