summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-05-10 14:41:57 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2020-05-27 11:06:46 +0200
commit8e3606698eb439eecd7302a885504365aca7e564 (patch)
tree6bb354ae72ab277548fafaab00a52aeaac5e61bb /src/lib/elementary
parent2d105a7e597a38a31ea88fefc02ac84b8b6e5543 (diff)
refactor build
libraries are split into deps, external deps, and pub deps. Evas engines are refactored to use the predefined engine deps. this is preparation work for efl-one. Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D11806
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/meson.build17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index fb4431d3f7..f6674fbdc3 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -712,7 +712,7 @@ elementary_header_src = [
712 'Elementary_Cursor.h' 712 'Elementary_Cursor.h'
713] + elementary_pub_headers + elementary_headers_unstable 713] + elementary_pub_headers + elementary_headers_unstable
714 714
715elementary_src = [ 715elementary_src = files([
716 'elm_priv.h', 716 'elm_priv.h',
717 'elementary_config.h', 717 'elementary_config.h',
718 'els_box.h', 718 'els_box.h',
@@ -947,12 +947,12 @@ elementary_src = [
947 'efl_ui_stack.c', 947 'efl_ui_stack.c',
948 'efl_ui_separator.c', 948 'efl_ui_separator.c',
949 'efl_ui_spotlight_animation_manager.c', 949 'efl_ui_spotlight_animation_manager.c',
950] 950])
951 951
952elementary_deps = [emile, eo, efl, edje, ethumb, ethumb_client, emotion, ecore_imf, ecore_con, eldbus, efreet, eio, atspi, dl, intl] 952elementary_deps = [emile, eo, efl, edje, ethumb, ethumb_client, emotion, ecore_imf, ecore_con, eldbus, efreet, eio]
953elementary_pub_deps = [eina, eet, evas, ecore, ecore_evas, ecore_file, ecore_input, ecore_imf, ecore_con, 953elementary_pub_deps = [eina, eet, evas, ecore, ecore_evas, ecore_file, ecore_input, ecore_imf, ecore_con,
954 edje, eldbus, efreet, ethumb_client, efl] 954 edje, eldbus, efreet, ethumb_client, efl]
955 955elementary_ext_deps = [atspi, dl, intl]
956elm_options = configuration_data() 956elm_options = configuration_data()
957 957
958config_h.set_quoted('ELM_TOP_BUILD_DIR', meson.build_root()) 958config_h.set_quoted('ELM_TOP_BUILD_DIR', meson.build_root())
@@ -986,6 +986,10 @@ endif
986if get_option('wl') 986if get_option('wl')
987 config_h.set('HAVE_ELEMENTARY_WL2', '1') 987 config_h.set('HAVE_ELEMENTARY_WL2', '1')
988 elementary_deps += ecore_wl2 988 elementary_deps += ecore_wl2
989 elementary_ext_deps += declare_dependency(
990 include_directories: include_directories([join_paths('..', '..', 'modules', 'ecore_evas', 'engines', 'wayland'), join_paths('..', '..', 'lib', 'ecore_wl2')]),
991 dependencies : ecore_wl2_internal_headers
992 )
989endif 993endif
990 994
991if get_option('drm') 995if get_option('drm')
@@ -1013,8 +1017,8 @@ elm_package_c_args = package_c_args
1013 1017
1014elementary_lib = library('elementary', 1018elementary_lib = library('elementary',
1015 elementary_src, pub_eo_file_target, priv_eo_file_target, c, embed_config, 1019 elementary_src, pub_eo_file_target, priv_eo_file_target, c, embed_config,
1016 dependencies: elementary_pub_deps + elementary_deps, 1020 dependencies: elementary_pub_deps + elementary_deps + elementary_ext_deps,
1017 include_directories : config_dir + [include_directories('.')] + [include_directories(join_paths('..', '..', '..'))] + [ecore_evas_wayland_engine_include_dir], 1021 include_directories : config_dir + [include_directories('.')] + [include_directories(join_paths('..', '..', '..'))],
1018 install: true, 1022 install: true,
1019 c_args : elm_package_c_args, 1023 c_args : elm_package_c_args,
1020 version : meson.project_version() 1024 version : meson.project_version()
@@ -1027,7 +1031,6 @@ elementary = declare_dependency(
1027 dependencies: elementary_pub_deps, 1031 dependencies: elementary_pub_deps,
1028) 1032)
1029 1033
1030
1031if get_option('install-eo-files') 1034if get_option('install-eo-files')
1032 install_data(pub_eo_files + pub_eo_types_files, 1035 install_data(pub_eo_files + pub_eo_types_files,
1033 install_dir: join_paths(eolian_include_dir, package_version_name) 1036 install_dir: join_paths(eolian_include_dir, package_version_name)