summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-10-19 15:47:44 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2018-10-24 12:05:58 +0200
commite19d2391476965d7b8e8865a766734947cc3099f (patch)
tree2ae1c6f451970a92b10b550995aecb512e38a817 /src/lib
parent5a3d79d3833a85675a26875594b5b07a99d79365 (diff)
meson: prepare general build for the bindings
for bindings we needed a system that could be used to find all special directories of every subsystem, for eo files headers etc. The mechanism is documented in the root meson.build Differential Revision: https://phab.enlightenment.org/D7180
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/efl/interfaces/meson.build12
-rw-r--r--src/lib/efl/meson.build7
-rw-r--r--src/lib/evas/canvas/meson.build6
-rw-r--r--src/lib/evas/gesture/meson.build6
-rw-r--r--src/lib/evas/meson.build3
-rw-r--r--src/lib/evas_goal/meson.build11
6 files changed, 38 insertions, 7 deletions
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index cb39cff2..012bc12 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -119,6 +119,8 @@ foreach eo_file : pub_eo_files
119 '-gchd', '@INPUT@']) 119 '-gchd', '@INPUT@'])
120endforeach 120endforeach
121 121
122pub_eo_files += pub_legacy_eo_files
123
122pub_eo_types_files = [ 124pub_eo_types_files = [
123 'efl_gfx_types.eot', 125 'efl_gfx_types.eot',
124 'efl_ui_types.eot', 126 'efl_ui_types.eot',
@@ -140,7 +142,15 @@ foreach eo_file : pub_eo_types_files
140 '-ghd', '@INPUT@']) 142 '-ghd', '@INPUT@'])
141endforeach 143endforeach
142 144
143pub_eo_files = files(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files) 145install_data(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files,
146 install_dir: join_paths(eolian_include_dir, package_version_name)
147)
148
149efl_interfaces_eo_files = pub_eo_files
150efl_interfaces_eot_files = pub_eo_types_files
151
152pub_eo_files = []
153pub_eo_types_files = []
144 154
145efl_src += files([ 155efl_src += files([
146 'efl_interfaces_main.c', 156 'efl_interfaces_main.c',
diff --git a/src/lib/efl/meson.build b/src/lib/efl/meson.build
index 75acef3..cadf14b 100644
--- a/src/lib/efl/meson.build
+++ b/src/lib/efl/meson.build
@@ -9,6 +9,7 @@ efl_header_src = [
9efl_src = [] 9efl_src = []
10 10
11subdir('interfaces') 11subdir('interfaces')
12package_header_subdirs += 'interfaces'
12 13
13efl_lib = library('efl', 14efl_lib = library('efl',
14 efl_src, pub_eo_file_target, 15 efl_src, pub_eo_file_target,
@@ -24,10 +25,8 @@ efl = declare_dependency(
24 sources : pub_eo_file_target 25 sources : pub_eo_file_target
25) 26)
26 27
27install_data(pub_eo_files,
28 install_dir: join_paths(eolian_include_dir, package_version_name)
29)
30
31install_headers(efl_header_src, 28install_headers(efl_header_src,
32 install_dir : dir_package_include, 29 install_dir : dir_package_include,
33) 30)
31
32package_eo_subdirs += ['interfaces']
diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build
index 982d8f3..811f656 100644
--- a/src/lib/evas/canvas/meson.build
+++ b/src/lib/evas/canvas/meson.build
@@ -79,6 +79,8 @@ pub_eo_files = [
79 'efl_canvas_text.eo' 79 'efl_canvas_text.eo'
80] 80]
81 81
82evas_canvas_eo_files = pub_eo_files
83
82pub_evas_eo_files += files(pub_eo_files) 84pub_evas_eo_files += files(pub_eo_files)
83 85
84foreach eo_file : pub_eo_files 86foreach eo_file : pub_eo_files
@@ -111,6 +113,8 @@ pub_eo_types_files = [
111 'efl_canvas_animation_types.eot' 113 'efl_canvas_animation_types.eot'
112] 114]
113 115
116evas_canvas_eot_files = pub_eo_types_files
117
114foreach eo_file : pub_eo_types_files 118foreach eo_file : pub_eo_types_files
115 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 119 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
116 input : eo_file, 120 input : eo_file,
@@ -217,3 +221,5 @@ evas_include_directories += include_directories('.')
217install_headers('evas_textblock_legacy.h', 221install_headers('evas_textblock_legacy.h',
218 install_dir : join_paths(dir_package_include, 'canvas'), 222 install_dir : join_paths(dir_package_include, 'canvas'),
219) 223)
224
225pub_eo_types_files = []
diff --git a/src/lib/evas/gesture/meson.build b/src/lib/evas/gesture/meson.build
index a628926..5a341f5 100644
--- a/src/lib/evas/gesture/meson.build
+++ b/src/lib/evas/gesture/meson.build
@@ -7,6 +7,8 @@ pub_eo_files = [
7 'efl_canvas_gesture_manager.eo' 7 'efl_canvas_gesture_manager.eo'
8] 8]
9 9
10evas_gesture_eo_files = pub_eo_files
11
10foreach eo_file : pub_eo_files 12foreach eo_file : pub_eo_files
11 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 13 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
12 input : eo_file, 14 input : eo_file,
@@ -65,9 +67,11 @@ endforeach
65pub_eo_types_files = [ 67pub_eo_types_files = [
66 'efl_canvas_gesture_types.eot', 68 'efl_canvas_gesture_types.eot',
67] 69]
70evas_gesture_eot_files = pub_eo_types_files
68 71
69pub_evas_eot_files += files(pub_eo_types_files) 72pub_evas_eot_files += files(pub_eo_types_files)
70 73
74
71foreach eo_file : pub_eo_types_files 75foreach eo_file : pub_eo_types_files
72 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 76 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
73 input : eo_file, 77 input : eo_file,
@@ -91,3 +95,5 @@ evas_src += files([
91 'efl_canvas_gesture_recognizer_long_tap.c', 95 'efl_canvas_gesture_recognizer_long_tap.c',
92 'efl_canvas_gesture_manager.c', 96 'efl_canvas_gesture_manager.c',
93]) 97])
98
99pub_eo_types_files = []
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 9c11803..2316359 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -187,3 +187,6 @@ install_headers(evas_header_src,
187) 187)
188 188
189automatic_pkgfile = false 189automatic_pkgfile = false
190pub_eo_files = []
191package_eo_subdirs += ['canvas', 'gesture']
192package_header_subdirs += ['canvas', 'gesture']
diff --git a/src/lib/evas_goal/meson.build b/src/lib/evas_goal/meson.build
index 0570068..d233520 100644
--- a/src/lib/evas_goal/meson.build
+++ b/src/lib/evas_goal/meson.build
@@ -7,9 +7,11 @@ evas_lib = library('evas',
7 version : meson.project_version() 7 version : meson.project_version()
8) 8)
9 9
10evas_pub_deps = [eina, ecore, ector, emile, evas_pre]
11
10evas = declare_dependency( 12evas = declare_dependency(
11 link_with : [evas_lib], 13 link_with : [evas_lib],
12 dependencies : [eina, ecore, ector, emile, evas_pre], 14 dependencies : evas_pub_deps,
13 include_directories : evas_include_directories 15 include_directories : evas_include_directories
14) 16)
15 17
@@ -19,11 +21,16 @@ evas_bin = declare_dependency(
19 include_directories : evas_include_directories 21 include_directories : evas_include_directories
20) 22)
21 23
24tmp_package_subdirs = []
22automatic_pkgfile = false 25automatic_pkgfile = false
23 26
27foreach subdir : evas_header_subdirs
28 tmp_package_subdirs += join_paths('evas-'+version_major, subdir)
29endforeach
30
24pkgconfig.generate(evas_lib, 31pkgconfig.generate(evas_lib,
25 name : 'evas', 32 name : 'evas',
26 subdirs : 'evas-'+version_major, 33 subdirs : ['evas-'+version_major] + tmp_package_subdirs,
27 version : version_major + '.' + version_minor, 34 version : version_major + '.' + version_minor,
28 libraries : [eina, ecore, ector, emile, dependency('luajit')], 35 libraries : [eina, ecore, ector, emile, dependency('luajit')],
29) 36)