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
This commit is contained in:
parent
59127058af
commit
3ca9d72825
|
@ -79,6 +79,7 @@ endif
|
||||||
|
|
||||||
ecore_audio_lib = library('ecore_audio',
|
ecore_audio_lib = library('ecore_audio',
|
||||||
ecore_audio_src, pub_eo_file_target,
|
ecore_audio_src, pub_eo_file_target,
|
||||||
|
c_args : package_c_args,
|
||||||
dependencies: ecore_audio_pub_deps + [m] + ecore_audio_deps,
|
dependencies: ecore_audio_pub_deps + [m] + ecore_audio_deps,
|
||||||
include_directories : config_dir,
|
include_directories : config_dir,
|
||||||
install: true,
|
install: true,
|
||||||
|
|
|
@ -30,6 +30,7 @@ ecore_evas_src = [
|
||||||
|
|
||||||
ecore_evas_lib = library('ecore_evas',
|
ecore_evas_lib = library('ecore_evas',
|
||||||
ecore_evas_src, pub_eo_file_target,
|
ecore_evas_src, pub_eo_file_target,
|
||||||
|
c_args : package_c_args,
|
||||||
dependencies: [ecore_evas_deps, buildsystem],
|
dependencies: [ecore_evas_deps, buildsystem],
|
||||||
include_directories : config_dir,
|
include_directories : config_dir,
|
||||||
install: true,
|
install: true,
|
||||||
|
|
|
@ -22,6 +22,7 @@ ecore_file_header_src = ['Ecore_File.h']
|
||||||
|
|
||||||
ecore_file_lib = library('ecore_file',
|
ecore_file_lib = library('ecore_file',
|
||||||
ecore_file_src,
|
ecore_file_src,
|
||||||
|
c_args : package_c_args,
|
||||||
dependencies: ecore_file_deps + ecore_file_pub_deps + ecore_file_deps,
|
dependencies: ecore_file_deps + ecore_file_pub_deps + ecore_file_deps,
|
||||||
include_directories : config_dir + [include_directories(join_paths('..','..'))],
|
include_directories : config_dir + [include_directories(join_paths('..','..'))],
|
||||||
install: true,
|
install: true,
|
||||||
|
|
|
@ -20,6 +20,7 @@ endif
|
||||||
|
|
||||||
ecore_input_lib = library('ecore_input',
|
ecore_input_lib = library('ecore_input',
|
||||||
ecore_input_src, pub_eo_file_target,
|
ecore_input_src, pub_eo_file_target,
|
||||||
|
c_args : package_c_args,
|
||||||
dependencies: ecore_input_pub_deps + ecore_input_deps,
|
dependencies: ecore_input_pub_deps + ecore_input_deps,
|
||||||
include_directories : config_dir,
|
include_directories : config_dir,
|
||||||
install: true,
|
install: true,
|
||||||
|
|
|
@ -14,6 +14,7 @@ ecore_input_evas_src = [
|
||||||
|
|
||||||
ecore_input_evas_lib = library('ecore_input_evas',
|
ecore_input_evas_lib = library('ecore_input_evas',
|
||||||
ecore_input_evas_src, pub_eo_file_target,
|
ecore_input_evas_src, pub_eo_file_target,
|
||||||
|
c_args : package_c_args,
|
||||||
dependencies: ecore_input_evas_pub_deps + ecore_input_evas_deps,
|
dependencies: ecore_input_evas_pub_deps + ecore_input_evas_deps,
|
||||||
include_directories : config_dir,
|
include_directories : config_dir,
|
||||||
install: true,
|
install: true,
|
||||||
|
|
|
@ -12,6 +12,7 @@ ecore_ipc_src = [
|
||||||
|
|
||||||
ecore_ipc_lib = library('ecore_ipc',
|
ecore_ipc_lib = library('ecore_ipc',
|
||||||
ecore_ipc_src, pub_eo_file_target,
|
ecore_ipc_src, pub_eo_file_target,
|
||||||
|
c_args : package_c_args,
|
||||||
dependencies: ecore_ipc_deps + ecore_ipc_pub_deps,
|
dependencies: ecore_ipc_deps + ecore_ipc_pub_deps,
|
||||||
include_directories : config_dir,
|
include_directories : config_dir,
|
||||||
install: true,
|
install: true,
|
||||||
|
|
|
@ -82,6 +82,7 @@ subdir('software')
|
||||||
|
|
||||||
ector_lib = library('ector',
|
ector_lib = library('ector',
|
||||||
ector_src, pub_eo_file_target,
|
ector_src, pub_eo_file_target,
|
||||||
|
c_args : package_c_args,
|
||||||
dependencies: ector_pub_deps + [triangulator, freetype, draw, m] + ector_deps,
|
dependencies: ector_pub_deps + [triangulator, freetype, draw, m] + ector_deps,
|
||||||
include_directories : config_dir,
|
include_directories : config_dir,
|
||||||
install: true,
|
install: true,
|
||||||
|
|
|
@ -20,6 +20,7 @@ eet_src = [
|
||||||
|
|
||||||
eet_lib = library('eet',
|
eet_lib = library('eet',
|
||||||
eet_src, pub_eo_file_target,
|
eet_src, pub_eo_file_target,
|
||||||
|
c_args : package_c_args,
|
||||||
dependencies: eet_deps + eet_pub_deps,
|
dependencies: eet_deps + eet_pub_deps,
|
||||||
include_directories : config_dir,
|
include_directories : config_dir,
|
||||||
install: true,
|
install: true,
|
||||||
|
|
|
@ -13,6 +13,7 @@ package_header_subdirs += 'interfaces'
|
||||||
|
|
||||||
efl_lib = library('efl',
|
efl_lib = library('efl',
|
||||||
efl_src, pub_eo_file_target,
|
efl_src, pub_eo_file_target,
|
||||||
|
c_args : package_c_args,
|
||||||
dependencies: [eina, eo, m],
|
dependencies: [eina, eo, m],
|
||||||
install: true,
|
install: true,
|
||||||
version : meson.project_version()
|
version : meson.project_version()
|
||||||
|
|
|
@ -362,6 +362,7 @@ endif
|
||||||
execinfo = cc.find_library('execinfo', required: false)
|
execinfo = cc.find_library('execinfo', required: false)
|
||||||
|
|
||||||
eina_lib = library('eina', sources,
|
eina_lib = library('eina', sources,
|
||||||
|
c_args : package_c_args,
|
||||||
include_directories : config_dir,
|
include_directories : config_dir,
|
||||||
dependencies: [m, rt, dl, execinfo, iconv, eina_deps, thread_dep, eina_mem_pools, evil],
|
dependencies: [m, rt, dl, execinfo, iconv, eina_deps, thread_dep, eina_mem_pools, evil],
|
||||||
install: true,
|
install: true,
|
||||||
|
|
|
@ -96,6 +96,7 @@ eldbus_deps += dependency('dbus-1')
|
||||||
|
|
||||||
eldbus_lib = library('eldbus',
|
eldbus_lib = library('eldbus',
|
||||||
eldbus_src, pub_eo_file_target,
|
eldbus_src, pub_eo_file_target,
|
||||||
|
c_args : package_c_args,
|
||||||
dependencies: eldbus_pub_deps + eldbus_deps,
|
dependencies: eldbus_pub_deps + eldbus_deps,
|
||||||
include_directories : config_dir,
|
include_directories : config_dir,
|
||||||
install: true,
|
install: true,
|
||||||
|
|
|
@ -1008,7 +1008,8 @@ c = configure_file(
|
||||||
install_dir : dir_package_include,
|
install_dir : dir_package_include,
|
||||||
configuration: elm_options)
|
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_lib = library('elementary',
|
||||||
elementary_src, pub_eo_file_target, priv_eo_file_target, c, embed_config,
|
elementary_src, pub_eo_file_target, priv_eo_file_target, c, embed_config,
|
||||||
|
|
|
@ -25,6 +25,7 @@ endif
|
||||||
|
|
||||||
emile_lib = library('emile',
|
emile_lib = library('emile',
|
||||||
emile_src,
|
emile_src,
|
||||||
|
c_args : package_c_args,
|
||||||
include_directories: config_dir,
|
include_directories: config_dir,
|
||||||
dependencies: emile_pub_deps + emile_deps + [lz4, rg_etc, m],
|
dependencies: emile_pub_deps + emile_deps + [lz4, rg_etc, m],
|
||||||
install: true,
|
install: true,
|
||||||
|
|
|
@ -44,17 +44,18 @@ if get_option('eeze') == true
|
||||||
emotion_deps += [eeze]
|
emotion_deps += [eeze]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Save in extra variable here to pass to edje_externa
|
||||||
|
emotion_package_c_args = package_c_args
|
||||||
|
|
||||||
emotion_lib = library('emotion',
|
emotion_lib = library('emotion',
|
||||||
emotion_src, pub_eo_file_target, priv_eo_file_target,
|
emotion_src, pub_eo_file_target, priv_eo_file_target,
|
||||||
dependencies: emotion_deps + emotion_pub_deps,
|
dependencies: emotion_deps + emotion_pub_deps,
|
||||||
include_directories : config_dir + [include_directories('.')],
|
include_directories : config_dir + [include_directories('.')],
|
||||||
install: true,
|
install: true,
|
||||||
c_args : package_c_args,
|
c_args : emotion_package_c_args,
|
||||||
version : meson.project_version()
|
version : meson.project_version()
|
||||||
)
|
)
|
||||||
|
|
||||||
emotion_package_c_args = package_c_args
|
|
||||||
|
|
||||||
emotion = declare_dependency(
|
emotion = declare_dependency(
|
||||||
include_directories: [include_directories('.')],
|
include_directories: [include_directories('.')],
|
||||||
link_with: emotion_lib,
|
link_with: emotion_lib,
|
||||||
|
|
|
@ -60,6 +60,7 @@ eolian_include_directories += ['-I', meson.current_source_dir()]
|
||||||
|
|
||||||
eo_lib = library('eo',
|
eo_lib = library('eo',
|
||||||
eo_src, pub_eo_file_target,
|
eo_src, pub_eo_file_target,
|
||||||
|
c_args : package_c_args,
|
||||||
dependencies: [eina, valgrind, dl, execinfo],
|
dependencies: [eina, valgrind, dl, execinfo],
|
||||||
install: true,
|
install: true,
|
||||||
version : meson.project_version()
|
version : meson.project_version()
|
||||||
|
@ -67,9 +68,9 @@ eo_lib = library('eo',
|
||||||
|
|
||||||
eo_lib_dbg = library('eo_dbg',
|
eo_lib_dbg = library('eo_dbg',
|
||||||
eo_src, pub_eo_file_target,
|
eo_src, pub_eo_file_target,
|
||||||
|
c_args : package_c_args + [ '-DEO_DEBUG' ],
|
||||||
dependencies: [eina, valgrind, dl, execinfo],
|
dependencies: [eina, valgrind, dl, execinfo],
|
||||||
install: true,
|
install: true,
|
||||||
c_args : '-DEO_DEBUG',
|
|
||||||
version : meson.project_version()
|
version : meson.project_version()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -285,7 +285,7 @@ evas_lib = library('evas',
|
||||||
dependencies: [evas_deps, m, draw, valgrind, libunibreak, evas_static_list],
|
dependencies: [evas_deps, m, draw, valgrind, libunibreak, evas_static_list],
|
||||||
link_with: evas_link,
|
link_with: evas_link,
|
||||||
install: true,
|
install: true,
|
||||||
c_args : '-DPACKAGE_DATA_DIR="'+join_paths(dir_data, 'evas')+'"',
|
c_args : package_c_args,
|
||||||
version : meson.project_version()
|
version : meson.project_version()
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@ if target_machine.system() == 'windows'
|
||||||
uuid = cc.find_library('uuid')
|
uuid = cc.find_library('uuid')
|
||||||
|
|
||||||
evil_lib = library('evil', evil_src,
|
evil_lib = library('evil', evil_src,
|
||||||
|
c_args : package_c_args,
|
||||||
dependencies : [psapi, ole32, ws2_32, secur32, uuid, regexp],
|
dependencies : [psapi, ole32, ws2_32, secur32, uuid, regexp],
|
||||||
include_directories : [config_dir],
|
include_directories : [config_dir],
|
||||||
install: true,
|
install: true,
|
||||||
|
|
Loading…
Reference in New Issue