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)
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(
92 dependencies: ecore_audio_pub_deps, 92 dependencies: ecore_audio_pub_deps,
93) 93)
94 94
95if get_option('install-eo-files') 95#
96 install_data(pub_eo_files + pub_eo_types_files, 96# Only enable that again when the namespace problems are fixed. ref T8648
97 install_dir: eolian_ecore_dir 97#
98 ) 98#if get_option('install-eo-files')
99endif 99# install_data(pub_eo_files + pub_eo_types_files,
100# install_dir: eolian_ecore_dir
101# )
102#endif
100 103
101install_headers(ecore_audio_header_src, 104install_headers(ecore_audio_header_src,
102 install_dir : dir_package_include, 105 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
34 '-gchd', '@INPUT@']) 34 '-gchd', '@INPUT@'])
35endforeach 35endforeach
36 36
37 37#
38if get_option('install-eo-files') 38# Only enable that again when the namespace problems are fixed. ref T8648
39 install_data(pub_eo_files, 39#
40 install_dir: join_paths(eolian_include_dir, package_version_name) 40#if get_option('install-eo-files')
41 ) 41# install_data(pub_eo_files,
42endif 42# install_dir: join_paths(eolian_include_dir, package_version_name)
43# )
44#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 = [
56 'ector_types.eot' 56 'ector_types.eot'
57] 57]
58 58
59if get_option('install-eo-files') 59#
60 install_data(ector_pub_eo_files + pub_eo_types_files, 60# Only enable that again when the namespace problems are fixed. ref T8648
61 install_dir: join_paths(eolian_include_dir, package_version_name) 61#
62 ) 62#if get_option('install-eo-files')
63endif 63# install_data(ector_pub_eo_files + pub_eo_types_files,
64# install_dir: join_paths(eolian_include_dir, package_version_name)
65# )
66#endif
64 67
65foreach eo_file : pub_eo_types_files 68foreach eo_file : pub_eo_types_files
66 pub_eo_file_target += custom_target('eolian_gen_' + eo_file, 69 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
48endif 48endif
49 49
50 50
51if get_option('install-eo-files') 51#
52 install_data(pub_eo_files, 52# Only enable that again when the namespace problems are fixed. ref T8648
53 install_dir: join_paths(eolian_include_dir, package_version_name) 53#
54 ) 54#if get_option('install-eo-files')
55endif 55# install_data(pub_eo_files,
56# install_dir: join_paths(eolian_include_dir, package_version_name)
57# )
58#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(
109 dependencies: eldbus_pub_deps, 109 dependencies: eldbus_pub_deps,
110) 110)
111 111
112 112#
113if get_option('install-eo-files') 113# Only enable that again when the namespace problems are fixed. ref T8648
114 install_data(pub_eo_files + pub_eo_types_files, 114#
115 install_dir: join_paths(eolian_include_dir, package_version_name) 115#if get_option('install-eo-files')
116 ) 116# install_data(pub_eo_files + pub_eo_types_files,
117endif 117# install_dir: join_paths(eolian_include_dir, package_version_name)
118# )
119#endif
118 120
119install_headers(eldbus_header_src, 121install_headers(eldbus_header_src,
120 install_dir : dir_package_include, 122 install_dir : dir_package_include,