summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-10-18 16:11:22 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2018-10-18 16:12:13 +0200
commit52e0b8440b552562a1bde01ee960069e6353a62a (patch)
treefa7a07e989c823c065e250940cab65b2b1253095 /src/lib
parent2643ce0aadbf7b77cdb021404a7c93b0e0c43bca (diff)
Revert "meson: add cxx bindings"
This reverts commit 5aaf2cbb5defd64a2048fe90e80004d435bbca1a. The cxx bindings were accidently merged. Things are missing (like .eot.h files)
Diffstat (limited to '')
-rw-r--r--src/lib/efl/interfaces/meson.build10
-rw-r--r--src/lib/efl/meson.build6
-rw-r--r--src/lib/evas/canvas/meson.build2
-rw-r--r--src/lib/evas/gesture/meson.build2
-rw-r--r--src/lib/evas/meson.build2
-rw-r--r--src/lib/evas_goal/meson.build4
6 files changed, 6 insertions, 20 deletions
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index 078e43f8c6..8d29c404a8 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -107,8 +107,6 @@ foreach eo_file : pub_eo_files
107 '-gch', '@INPUT@']) 107 '-gch', '@INPUT@'])
108endforeach 108endforeach
109 109
110pub_eo_files += pub_legacy_eo_files
111
112pub_eo_types_files = [ 110pub_eo_types_files = [
113 'efl_gfx_types.eot', 111 'efl_gfx_types.eot',
114 'efl_ui_types.eot', 112 'efl_ui_types.eot',
@@ -128,13 +126,7 @@ foreach eo_file : pub_eo_types_files
128 '-gh', '@INPUT@']) 126 '-gh', '@INPUT@'])
129endforeach 127endforeach
130 128
131install_data(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files, 129pub_eo_files = files(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files)
132 install_dir: join_paths(eolian_include_dir, package_version_name)
133)
134
135efl_interfaces_eo_files = pub_eo_files
136
137pub_eo_files = []
138 130
139efl_src += files([ 131efl_src += files([
140 'efl_interfaces_main.c', 132 'efl_interfaces_main.c',
diff --git a/src/lib/efl/meson.build b/src/lib/efl/meson.build
index 6677cf2327..75acef3b54 100644
--- a/src/lib/efl/meson.build
+++ b/src/lib/efl/meson.build
@@ -24,8 +24,10 @@ efl = declare_dependency(
24 sources : pub_eo_file_target 24 sources : pub_eo_file_target
25) 25)
26 26
27install_data(pub_eo_files,
28 install_dir: join_paths(eolian_include_dir, package_version_name)
29)
30
27install_headers(efl_header_src, 31install_headers(efl_header_src,
28 install_dir : dir_package_include, 32 install_dir : dir_package_include,
29) 33)
30
31efl_eo_subdirs = ['interfaces']
diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build
index e6298f70cd..47db33de4b 100644
--- a/src/lib/evas/canvas/meson.build
+++ b/src/lib/evas/canvas/meson.build
@@ -77,8 +77,6 @@ pub_eo_files = [
77 'efl_canvas_text.eo' 77 'efl_canvas_text.eo'
78] 78]
79 79
80evas_canvas_eo_files = pub_eo_files
81
82pub_evas_eo_files += files(pub_eo_files) 80pub_evas_eo_files += files(pub_eo_files)
83 81
84foreach eo_file : pub_eo_files 82foreach eo_file : pub_eo_files
diff --git a/src/lib/evas/gesture/meson.build b/src/lib/evas/gesture/meson.build
index cd755f51c3..62d9b27599 100644
--- a/src/lib/evas/gesture/meson.build
+++ b/src/lib/evas/gesture/meson.build
@@ -7,8 +7,6 @@ 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
12foreach eo_file : pub_eo_files 10foreach eo_file : pub_eo_files
13 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 11 pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
14 input : eo_file, 12 input : eo_file,
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 8175c87565..d72032d957 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -173,5 +173,3 @@ install_headers(evas_header_src,
173) 173)
174 174
175automatic_pkgfile = false 175automatic_pkgfile = false
176pub_eo_files = []
177evas_eo_subdirs = ['canvas', 'gesture']
diff --git a/src/lib/evas_goal/meson.build b/src/lib/evas_goal/meson.build
index 28db42f00b..057006884c 100644
--- a/src/lib/evas_goal/meson.build
+++ b/src/lib/evas_goal/meson.build
@@ -7,11 +7,9 @@ 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
12evas = declare_dependency( 10evas = declare_dependency(
13 link_with : [evas_lib], 11 link_with : [evas_lib],
14 dependencies : evas_pub_deps, 12 dependencies : [eina, ecore, ector, emile, evas_pre],
15 include_directories : evas_include_directories 13 include_directories : evas_include_directories
16) 14)
17 15