Revert "meson: add cxx bindings"

This reverts commit 5aaf2cbb5defd64a2048fe90e80004d435bbca1a.

The cxx bindings were accidently merged. Things are missing (like .eot.h
files)

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
                            '-gch', '@INPUT@'])
 endforeach
 
-pub_eo_files += pub_legacy_eo_files
-
 pub_eo_types_files = [
   'efl_gfx_types.eot',
   'efl_ui_types.eot',
@@ -128,13 +126,7 @@ foreach eo_file : pub_eo_types_files
                            '-gh', '@INPUT@'])
 endforeach
 
-install_data(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files,
-  install_dir: join_paths(eolian_include_dir, package_version_name)
-)
-
-efl_interfaces_eo_files = pub_eo_files
-
-pub_eo_files = []
+pub_eo_files = files(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files)
 
 efl_src += files([
   '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(
   sources : pub_eo_file_target
 )
 
+install_data(pub_eo_files,
+  install_dir: join_paths(eolian_include_dir, package_version_name)
+)
+
 install_headers(efl_header_src,
   install_dir : dir_package_include,
 )
-
-efl_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 = [
   'efl_canvas_text.eo'
 ]
 
-evas_canvas_eo_files = pub_eo_files
-
 pub_evas_eo_files += files(pub_eo_files)
 
 foreach 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 = [
   'efl_canvas_gesture_manager.eo'
 ]
 
-evas_gesture_eo_files = pub_eo_files
-
 foreach eo_file : pub_eo_files
   pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
     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,
 )
 
 automatic_pkgfile = false
-pub_eo_files = []
-evas_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',
     version : meson.project_version()
 )
 
-evas_pub_deps = [eina, ecore, ector, emile, evas_pre]
-
 evas = declare_dependency(
    link_with : [evas_lib],
-   dependencies : evas_pub_deps,
+   dependencies : [eina, ecore, ector, emile, evas_pre],
    include_directories : evas_include_directories
 )