From dbf3364a7616a50bb61f5e2e81e29f2b7e9bfaa8 Mon Sep 17 00:00:00 2001 From: Wonki Kim Date: Wed, 30 Jan 2019 08:43:32 +0000 Subject: [PATCH] meson: fix to make results same as a way it does in autotools I found that results of build are different by build tools. this patch fixes meson.build to make results same as a way it does in autotools. Differential Revision: https://phab.enlightenment.org/D7819 Change-Id: I8ff17e7064a022dbc965e4d2ab63a6a114515e10 --- ...gVersion.cmake.in => EflConfigVersion.cmake.in} | 0 cmakeconfig/meson.build | 2 +- configure.ac | 46 +++++++++++----------- data/eo/meson.build | 2 +- packaging/efl.spec | 1 - 5 files changed, 25 insertions(+), 26 deletions(-) rename cmakeconfig/{EFLConfigVersion.cmake.in => EflConfigVersion.cmake.in} (100%) diff --git a/cmakeconfig/EFLConfigVersion.cmake.in b/cmakeconfig/EflConfigVersion.cmake.in similarity index 100% rename from cmakeconfig/EFLConfigVersion.cmake.in rename to cmakeconfig/EflConfigVersion.cmake.in diff --git a/cmakeconfig/meson.build b/cmakeconfig/meson.build index 2261a4f..158b2a9 100644 --- a/cmakeconfig/meson.build +++ b/cmakeconfig/meson.build @@ -27,7 +27,7 @@ cmake_src = [ ] cmake_version_src = [ - 'EFL', + 'Efl', 'Elementary', ] diff --git a/configure.ac b/configure.ac index e6153a0..5546c66 100755 --- a/configure.ac +++ b/configure.ac @@ -5984,52 +5984,52 @@ dbus-services/org.enlightenment.Ethumb.service systemd-services/ethumb.service $po_makefile_in cmakeconfig/EflConfig.cmake -cmakeconfig/EflConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EflConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EinaConfig.cmake -cmakeconfig/EinaConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EinaConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EioConfig.cmake -cmakeconfig/EioConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EioConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EezeConfig.cmake -cmakeconfig/EezeConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EezeConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EoConfig.cmake -cmakeconfig/EoConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EoConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EolianConfig.cmake -cmakeconfig/EolianConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EolianConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EolianHelper.cmake cmakeconfig/EolianCxxConfig.cmake -cmakeconfig/EolianCxxConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EolianCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EinaCxxConfig.cmake -cmakeconfig/EinaCxxConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EinaCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EoCxxConfig.cmake -cmakeconfig/EoCxxConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EoCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EcoreCxxConfig.cmake -cmakeconfig/EcoreCxxConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EcoreCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EvasCxxConfig.cmake -cmakeconfig/EvasCxxConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EvasCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EetCxxConfig.cmake -cmakeconfig/EetCxxConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EetCxxConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EetConfig.cmake -cmakeconfig/EetConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EetConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EvasConfig.cmake -cmakeconfig/EvasConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EvasConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EcoreConfig.cmake -cmakeconfig/EcoreConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EcoreConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EdjeConfig.cmake -cmakeconfig/EdjeConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EdjeConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EldbusConfig.cmake -cmakeconfig/EldbusConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EldbusConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EfreetConfig.cmake -cmakeconfig/EfreetConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EfreetConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EthumbConfig.cmake -cmakeconfig/EthumbConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EthumbConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EthumbClientConfig.cmake -cmakeconfig/EthumbClientConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EthumbClientConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EmotionConfig.cmake -cmakeconfig/EmotionConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EmotionConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EluaConfig.cmake -cmakeconfig/EluaConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EluaConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/EmileConfig.cmake -cmakeconfig/EmileConfigVersion.cmake:cmakeconfig/EFLConfigVersion.cmake.in +cmakeconfig/EmileConfigVersion.cmake:cmakeconfig/EflConfigVersion.cmake.in cmakeconfig/ElementaryConfigVersion.cmake cmakeconfig/ElementaryConfig.cmake ]) diff --git a/data/eo/meson.build b/data/eo/meson.build index 8ccb578..d7bac57 100644 --- a/data/eo/meson.build +++ b/data/eo/meson.build @@ -9,5 +9,5 @@ configure_file( input: 'libeo-gdb.py.in', output: 'libeo.so.'+meson.project_version()+'-gdb.py', configuration: configuration, - install_dir: join_paths(dir_data, 'gdb', 'autoload', 'usr', 'lib') + install_dir: join_paths(dir_data, 'gdb', 'auto-load', 'usr', 'lib') ) diff --git a/packaging/efl.spec b/packaging/efl.spec index a822c36..9f2442f 100644 --- a/packaging/efl.spec +++ b/packaging/efl.spec @@ -1364,7 +1364,6 @@ ldconfig -l %{_libdir}/libelementary.so.1.21.* %defattr(-,root,root,-) %license licenses/COPYING.LGPL %{_libdir}/libeina.so.* -%{_bindir}/eina-bench-cmp %files -n eina-tools %manifest %{name}.manifest -- 2.7.4