summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2020-04-07 13:19:10 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2020-04-14 12:25:59 +0200
commit8cb311357c6473d4848636e6881be37926f5ed7c (patch)
tree3ec3161b0c7bab90e4fb7496654008ba1117b1b8
parent80bf4ace914077ff3987bef56be2aea55aad9edc (diff)
downloadefl-8cb311357c6473d4848636e6881be37926f5ed7c.tar.gz
meson: do not install namespace problem legacy files
these files are not required for the unified API, but they have namespace problems, so for now, do not install them Differential Revision: https://phab.enlightenment.org/D11665
-rw-r--r--src/lib/ecore_audio/meson.build13
-rw-r--r--src/lib/ector/gl/meson.build14
-rw-r--r--src/lib/ector/meson.build13
-rw-r--r--src/lib/ector/software/meson.build13
-rw-r--r--src/lib/eldbus/meson.build14
5 files changed, 40 insertions, 27 deletions
diff --git a/src/lib/ecore_audio/meson.build b/src/lib/ecore_audio/meson.build
index cbcaca4931..c03eb3e663 100644
--- a/src/lib/ecore_audio/meson.build
+++ b/src/lib/ecore_audio/meson.build
@@ -92,11 +92,14 @@ ecore_audio = declare_dependency(
dependencies: ecore_audio_pub_deps,
)
-if get_option('install-eo-files')
- install_data(pub_eo_files + pub_eo_types_files,
- install_dir: eolian_ecore_dir
- )
-endif
+#
+# Only enable that again when the namespace problems are fixed. ref T8648
+#
+#if get_option('install-eo-files')
+# install_data(pub_eo_files + pub_eo_types_files,
+# install_dir: eolian_ecore_dir
+# )
+#endif
install_headers(ecore_audio_header_src,
install_dir : dir_package_include,
diff --git a/src/lib/ector/gl/meson.build b/src/lib/ector/gl/meson.build
index ab87d79b4d..4bb792c3a7 100644
--- a/src/lib/ector/gl/meson.build
+++ b/src/lib/ector/gl/meson.build
@@ -34,9 +34,11 @@ foreach eo_file : pub_eo_files
'-gchd', '@INPUT@'])
endforeach
-
-if get_option('install-eo-files')
- install_data(pub_eo_files,
- install_dir: join_paths(eolian_include_dir, package_version_name)
- )
-endif
+#
+# Only enable that again when the namespace problems are fixed. ref T8648
+#
+#if get_option('install-eo-files')
+# install_data(pub_eo_files,
+# install_dir: join_paths(eolian_include_dir, package_version_name)
+# )
+#endif
diff --git a/src/lib/ector/meson.build b/src/lib/ector/meson.build
index b0d33a1d42..49fc5a477f 100644
--- a/src/lib/ector/meson.build
+++ b/src/lib/ector/meson.build
@@ -56,11 +56,14 @@ pub_eo_types_files = [
'ector_types.eot'
]
-if get_option('install-eo-files')
- install_data(ector_pub_eo_files + pub_eo_types_files,
- install_dir: join_paths(eolian_include_dir, package_version_name)
- )
-endif
+#
+# Only enable that again when the namespace problems are fixed. ref T8648
+#
+#if get_option('install-eo-files')
+# install_data(ector_pub_eo_files + pub_eo_types_files,
+# install_dir: join_paths(eolian_include_dir, package_version_name)
+# )
+#endif
foreach eo_file : pub_eo_types_files
pub_eo_file_target += custom_target('eolian_gen_' + eo_file,
diff --git a/src/lib/ector/software/meson.build b/src/lib/ector/software/meson.build
index 7374252729..75d217142a 100644
--- a/src/lib/ector/software/meson.build
+++ b/src/lib/ector/software/meson.build
@@ -48,8 +48,11 @@ if cpu_sse3 == true
endif
-if get_option('install-eo-files')
- install_data(pub_eo_files,
- install_dir: join_paths(eolian_include_dir, package_version_name)
- )
-endif
+#
+# Only enable that again when the namespace problems are fixed. ref T8648
+#
+#if get_option('install-eo-files')
+# install_data(pub_eo_files,
+# install_dir: join_paths(eolian_include_dir, package_version_name)
+# )
+#endif
diff --git a/src/lib/eldbus/meson.build b/src/lib/eldbus/meson.build
index de9902757d..054273acf8 100644
--- a/src/lib/eldbus/meson.build
+++ b/src/lib/eldbus/meson.build
@@ -109,12 +109,14 @@ eldbus = declare_dependency(
dependencies: eldbus_pub_deps,
)
-
-if get_option('install-eo-files')
- install_data(pub_eo_files + pub_eo_types_files,
- install_dir: join_paths(eolian_include_dir, package_version_name)
- )
-endif
+#
+# Only enable that again when the namespace problems are fixed. ref T8648
+#
+#if get_option('install-eo-files')
+# install_data(pub_eo_files + pub_eo_types_files,
+# install_dir: join_paths(eolian_include_dir, package_version_name)
+# )
+#endif
install_headers(eldbus_header_src,
install_dir : dir_package_include,