This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch dev/dimmus/test
in repository efl.
View the commit online.
commit a614e912d313a2a901b74049eb44ba0e6211a9c6
Author: dimmus <dmitri.chudi...@gmail.com>
AuthorDate: Mon Oct 7 13:45:49 2024 +0500
meson: join_path - clean src/lib
---
src/lib/ecore/meson.build | 16 +++++-----
src/lib/ecore_audio/meson.build | 6 ++--
src/lib/ecore_avahi/meson.build | 2 +-
src/lib/ecore_cocoa/meson.build | 10 +++---
src/lib/ecore_con/meson.build | 12 +++----
src/lib/ecore_drm/meson.build | 2 +-
src/lib/ecore_evas/meson.build | 9 ++++--
src/lib/ecore_file/meson.build | 2 +-
src/lib/ecore_sdl/meson.build | 2 +-
src/lib/ecore_wayland/meson.build | 2 +-
src/lib/ector/gl/meson.build | 8 ++---
src/lib/ector/meson.build | 12 +++----
src/lib/ector/software/meson.build | 8 ++---
src/lib/edje/meson.build | 18 +++++------
src/lib/eeze/meson.build | 6 ++--
src/lib/efl/interfaces/meson.build | 28 ++++++++---------
src/lib/efl_canvas_wl/meson.build | 10 +++---
src/lib/eina/meson.build | 2 +-
src/lib/eio/meson.build | 9 +++---
src/lib/eldbus/meson.build | 12 +++----
src/lib/elementary/meson.build | 38 +++++++++++------------
src/lib/elua/meson.build | 2 +-
src/lib/embryo/meson.build | 2 +-
src/lib/emotion/meson.build | 8 ++---
src/lib/eo/meson.build | 14 ++++-----
src/lib/eolian/meson.build | 8 ++---
src/lib/evas/canvas/meson.build | 22 ++++++-------
src/lib/evas/filters/lua/meson.build | 2 +-
src/lib/evas/gesture/meson.build | 14 ++++-----
src/lib/evas/include/meson.build | 6 ++--
src/lib/evas/meson.build | 34 ++++++++++----------
src/lib/evas/software_generic/filters/meson.build | 4 +--
src/lib/evas/software_generic/meson.build | 12 +++----
33 files changed, 171 insertions(+), 171 deletions(-)
diff --git a/src/lib/ecore/meson.build b/src/lib/ecore/meson.build
index dfc2dece55..175e830d1e 100644
--- a/src/lib/ecore/meson.build
+++ b/src/lib/ecore/meson.build
@@ -20,9 +20,9 @@ foreach eo_file : pub_legacy_eo_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-gchd', '@INPUT@'])
endforeach
@@ -80,9 +80,9 @@ foreach eo_file : pub_eo_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-gchd', '@INPUT@'])
endforeach
@@ -200,7 +200,7 @@ endif
ecore_lib = library('ecore',
ecore_src, pub_eo_file_target,
dependencies: ecore_pub_deps + [ecore_deps, ecore_ext_deps],
- include_directories : config_dir + [include_directories(join_paths('..','..'))],
+ include_directories : config_dir + [include_directories('../..')],
install: true,
c_args : package_c_args,
version : meson.project_version()
@@ -213,7 +213,7 @@ ecore = declare_dependency(
dependencies: ecore_pub_deps,
)
-eolian_ecore_dir = join_paths(eolian_include_dir, package_version_name)
+eolian_ecore_dir = eolian_include_dir / package_version_name
if get_option('install-eo-files')
install_data(pub_eo_files + pub_eo_types_files,
diff --git a/src/lib/ecore_audio/meson.build b/src/lib/ecore_audio/meson.build
index 95ffddf5b5..f2b2bb6ea9 100644
--- a/src/lib/ecore_audio/meson.build
+++ b/src/lib/ecore_audio/meson.build
@@ -21,9 +21,9 @@ foreach eo_file : pub_eo_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'ECORE_AUDIO_API',
'-gchd', '@INPUT@'])
endforeach
diff --git a/src/lib/ecore_avahi/meson.build b/src/lib/ecore_avahi/meson.build
index 6a14a4e9e9..4691ea4723 100644
--- a/src/lib/ecore_avahi/meson.build
+++ b/src/lib/ecore_avahi/meson.build
@@ -11,7 +11,7 @@ ecore_avahi_lib = library('ecore_avahi',
ecore_avahi_src,
c_args : package_c_args,
dependencies: [m] + ecore_avahi_deps + ecore_avahi_pub_deps,
- include_directories : config_dir + [include_directories(join_paths('..','..'))],
+ include_directories : config_dir + [include_directories('../..')],
install: true,
version : meson.project_version()
)
diff --git a/src/lib/ecore_cocoa/meson.build b/src/lib/ecore_cocoa/meson.build
index a44d6a4d58..44a2d476e6 100644
--- a/src/lib/ecore_cocoa/meson.build
+++ b/src/lib/ecore_cocoa/meson.build
@@ -24,11 +24,11 @@ ecore_cocoa_src = files([
])
evas_include_directories = [
- include_directories(join_paths('..', 'evas')),
- include_directories(join_paths('..', 'evas','canvas')),
- include_directories(join_paths('..', 'evas','common')),
- include_directories(join_paths('..', 'evas','include')),
- include_directories(join_paths('..', 'evas','filters'))
+ include_directories('../evas'),
+ include_directories('../evas/canvas'),
+ include_directories('../evas/common'),
+ include_directories('../evas/include'),
+ include_directories('../evas/filters')
]
ecore_cocoa_lib = library('ecore_cocoa',
diff --git a/src/lib/ecore_con/meson.build b/src/lib/ecore_con/meson.build
index d446055c1e..cbe42364ae 100644
--- a/src/lib/ecore_con/meson.build
+++ b/src/lib/ecore_con/meson.build
@@ -67,9 +67,9 @@ foreach eo_file : pub_eo_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'ECORE_CON_API',
'-gchd', '@INPUT@'])
endforeach
@@ -89,9 +89,9 @@ foreach eo_file : pub_eo_types_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'ECORE_CON_API',
'-gchd', '@INPUT@'])
endforeach
diff --git a/src/lib/ecore_drm/meson.build b/src/lib/ecore_drm/meson.build
index 9bc62a7be3..b8f486d9b5 100644
--- a/src/lib/ecore_drm/meson.build
+++ b/src/lib/ecore_drm/meson.build
@@ -23,7 +23,7 @@ ecore_drm_header_src = [
ecore_drm_lib = library('ecore_drm',
ecore_drm_src,
dependencies: [m] + ecore_drm_deps + ecore_drm_pub_deps,
- include_directories : config_dir + [include_directories(join_paths('..','..'))],
+ include_directories : config_dir + [include_directories('../..')],
install: true,
c_args : package_c_args,
)
diff --git a/src/lib/ecore_evas/meson.build b/src/lib/ecore_evas/meson.build
index 2ce2b0fcd2..b3bc139d21 100644
--- a/src/lib/ecore_evas/meson.build
+++ b/src/lib/ecore_evas/meson.build
@@ -29,7 +29,7 @@ ecore_evas_src = files([
])
ecore_evas_ext_deps += declare_dependency(
- include_directories: include_directories(join_paths('..', '..', 'modules', 'evas', 'engines', 'buffer')),
+ include_directories: include_directories('../../modules/evas/engines/buffer'),
)
@@ -43,7 +43,10 @@ ecore_evas_lib = library('ecore_evas',
)
ecore_evas = declare_dependency(
- include_directories: [include_directories('.'), include_directories(join_paths('..', '..', 'modules', 'evas', 'engines', 'buffer'))],
+ include_directories: [
+ include_directories('.'),
+ include_directories('../../modules/evas/engines/buffer')
+ ],
link_with: ecore_evas_lib,
sources : pub_eo_file_target + priv_eo_file_target,
dependencies: [evas],
@@ -54,4 +57,4 @@ install_headers(ecore_evas_header_src,
)
#a custom directory that must be added to efl_one
-efl_one_include_dirs += [include_directories(join_paths('..', '..', 'modules', 'evas', 'engines', 'buffer'))]
+efl_one_include_dirs += include_directories('../../modules/evas/engines/buffer')
diff --git a/src/lib/ecore_file/meson.build b/src/lib/ecore_file/meson.build
index a25d98dffb..659ecd4851 100644
--- a/src/lib/ecore_file/meson.build
+++ b/src/lib/ecore_file/meson.build
@@ -27,7 +27,7 @@ ecore_file_lib = library('ecore_file',
ecore_file_src,
c_args : package_c_args,
dependencies: ecore_file_deps + ecore_file_pub_deps + ecore_file_ext_deps,
- include_directories : config_dir + [include_directories(join_paths('..','..'))],
+ include_directories : config_dir + [include_directories('../..')],
install: true,
version : meson.project_version()
)
diff --git a/src/lib/ecore_sdl/meson.build b/src/lib/ecore_sdl/meson.build
index f3cd70428d..e6508a2bc5 100644
--- a/src/lib/ecore_sdl/meson.build
+++ b/src/lib/ecore_sdl/meson.build
@@ -16,7 +16,7 @@ ecore_sdl_ext_deps += dependency('sdl2')
ecore_sdl_lib = library('ecore_sdl',
ecore_sdl_src,
dependencies: [ecore_sdl_deps, ecore_sdl_pub_deps, ecore_sdl_ext_deps],
- include_directories : config_dir + [include_directories(join_paths('..','..'))],
+ include_directories : config_dir + [include_directories('../..')],
install: true,
c_args : package_c_args,
)
diff --git a/src/lib/ecore_wayland/meson.build b/src/lib/ecore_wayland/meson.build
index 4a24fb661e..4afd344993 100644
--- a/src/lib/ecore_wayland/meson.build
+++ b/src/lib/ecore_wayland/meson.build
@@ -26,7 +26,7 @@ ecore_wayland_header_src = [
ecore_wayland_lib = library('ecore_wayland',
ecore_wayland_src,
dependencies: [m] + ecore_wayland_deps + ecore_wayland_pub_deps,
- include_directories : config_dir + [include_directories(join_paths('..','..'))],
+ include_directories : config_dir + [include_directories('../..')],
install: true,
c_args : package_c_args,
)
diff --git a/src/lib/ector/gl/meson.build b/src/lib/ector/gl/meson.build
index 3837f0ece8..55cd9a4e21 100644
--- a/src/lib/ector/gl/meson.build
+++ b/src/lib/ector/gl/meson.build
@@ -28,9 +28,9 @@ foreach eo_file : pub_eo_files
install : false,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'ECTOR_API',
'-gchd', '@INPUT@'])
endforeach
@@ -40,6 +40,6 @@ endforeach
#
#if get_option('install-eo-files')
# install_data(pub_eo_files,
-# install_dir: join_paths(eolian_include_dir, package_version_name)
+# install_dir: eolian_include_dir / package_version_name
# )
#endif
diff --git a/src/lib/ector/meson.build b/src/lib/ector/meson.build
index 9a9545fee8..156a9f6139 100644
--- a/src/lib/ector/meson.build
+++ b/src/lib/ector/meson.build
@@ -43,9 +43,9 @@ foreach eo_file : pub_eo_files
install : false,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'ECTOR_API',
'-gchd', '@INPUT@'])
endforeach
@@ -63,7 +63,7 @@ pub_eo_types_files = [
#
#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)
+# install_dir: eolian_include_dir / package_version_name
# )
#endif
@@ -75,8 +75,8 @@ foreach eo_file : pub_eo_types_files
install : false,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'ECTOR_API',
'-ghd', '@INPUT@'])
endforeach
diff --git a/src/lib/ector/software/meson.build b/src/lib/ector/software/meson.build
index a87f66efa5..88345196ec 100644
--- a/src/lib/ector/software/meson.build
+++ b/src/lib/ector/software/meson.build
@@ -30,9 +30,9 @@ foreach eo_file : pub_eo_files
install : false,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'ECTOR_API',
'-gchd', '@INPUT@'])
endforeach
@@ -54,6 +54,6 @@ endif
#
#if get_option('install-eo-files')
# install_data(pub_eo_files,
-# install_dir: join_paths(eolian_include_dir, package_version_name)
+# install_dir: eolian_include_dir / package_version_name
# )
#endif
diff --git a/src/lib/edje/meson.build b/src/lib/edje/meson.build
index 8332f9525a..41f233a9a5 100644
--- a/src/lib/edje/meson.build
+++ b/src/lib/edje/meson.build
@@ -48,9 +48,9 @@ foreach eo_file : pub_legacy_eo_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-gchd', '@INPUT@'])
endforeach
@@ -66,8 +66,8 @@ foreach eo_file : pub_eo_types_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-ghd', '@INPUT@'])
endforeach
@@ -82,9 +82,9 @@ foreach eo_file : priv_eo_files
output : [eo_file + '.h'],
depfile : eo_file + '.d',
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-gchd', '@INPUT@'])
endforeach
@@ -164,7 +164,7 @@ edje = declare_dependency(
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)
+ install_dir: eolian_include_dir / package_version_name
)
endif
diff --git a/src/lib/eeze/meson.build b/src/lib/eeze/meson.build
index 1435fe7a2f..a9acaf1331 100644
--- a/src/lib/eeze/meson.build
+++ b/src/lib/eeze/meson.build
@@ -8,10 +8,10 @@ eeze_header_src = [
'Eeze_Net.h',
'Eeze_Sensor.h',
'Eeze_Disk.h',
- join_paths('..','..','bin','eeze','eeze_scanner','eeze_scanner.h')
+ '../../bin/eeze/eeze_scanner/eeze_scanner.h'
]
-eeze_src = files([
+eeze_src = files(
'eeze_main.c',
'eeze_net.c',
'eeze_net_private.h',
@@ -27,7 +27,7 @@ eeze_src = files([
'eeze_disk_udev.c',
'eeze_disk_mount.c',
'eeze_disk_private.h'
-])
+)
if get_option('v4l2')
config_h.set('HAVE_V4L2', '1')
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index 0b1bdd4556..a081a072c8 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -1,4 +1,4 @@
-eolian_include_directories += ['-I', join_paths(meson.source_root(), 'src', 'lib')]
+eolian_include_directories += ['-I', meson.source_root() / 'src/lib']
pub_legacy_eo_files = [
'efl_gfx_fill.eo',
@@ -20,11 +20,11 @@ foreach eo_file : pub_legacy_eo_files
output : [eo_file + '.h'],
depfile : eo_file + '.d',
install : true,
- install_dir : join_paths(dir_package_include, 'interfaces'),
+ install_dir : dir_package_include / 'interfaces',
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-gchd', '@INPUT@'])
endforeach
@@ -102,11 +102,11 @@ foreach eo_file : pub_eo_files
output : [eo_file + '.h'],
depfile : eo_file + '.d',
install : true,
- install_dir : join_paths(dir_package_include, 'interfaces'),
+ install_dir : dir_package_include / 'interfaces',
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-gchd', '@INPUT@'])
endforeach
@@ -125,16 +125,16 @@ foreach eo_file : pub_eo_types_files
output : [eo_file + '.h'],
depfile : eo_file + '.d',
install : true,
- install_dir : join_paths(dir_package_include, 'interfaces'),
+ install_dir : dir_package_include / 'interfaces',
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-ghd', '@INPUT@'])
endforeach
if get_option('install-eo-files')
install_data(pub_eo_files + pub_legacy_eo_files + pub_eo_types_files,
- install_dir: join_paths(eolian_include_dir, package_version_name)
+ install_dir: eolian_include_dir / package_version_name
)
endif
@@ -165,7 +165,7 @@ efl_src += files([
])
install_headers('efl_file.h',
- install_dir : join_paths(dir_package_include, 'interfaces'),
+ install_dir : dir_package_include / 'interfaces',
)
eolian_include_directories += ['-I', meson.current_source_dir()]
diff --git a/src/lib/efl_canvas_wl/meson.build b/src/lib/efl_canvas_wl/meson.build
index 5955da62eb..c29b8792c4 100644
--- a/src/lib/efl_canvas_wl/meson.build
+++ b/src/lib/efl_canvas_wl/meson.build
@@ -20,9 +20,9 @@ foreach eo_file : pub_eo_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-gchd', '@INPUT@'])
endforeach
@@ -37,7 +37,7 @@ eolian_include_directories += ['-I', meson.current_source_dir()]
efl_canvas_wl_lib = library('efl_canvas_wl',
efl_canvas_wl_src, pub_eo_file_target,
dependencies: efl_canvas_wl_deps + efl_canvas_wl_pub_deps + efl_canvas_wl_ext_deps,
- include_directories : config_dir + [include_directories(join_paths('..','..'))],
+ include_directories : config_dir + [include_directories('../..')],
install: true,
c_args : package_c_args,
version : meson.project_version()
@@ -54,7 +54,7 @@ install_headers(efl_canvas_wl_header_src,
install_dir : dir_package_include,
)
-eolian_efl_canvas_wl_dir = join_paths(eolian_include_dir, package_version_name)
+eolian_efl_canvas_wl_dir = eolian_include_dir / package_version_name
if get_option('install-eo-files')
install_data(pub_eo_files,
install_dir: eolian_efl_canvas_wl_dir
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index 5b8cdc3333..8d2aefc92f 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -400,7 +400,7 @@ install_headers(public_headers,
)
install_headers(public_sub_headers,
- install_dir : join_paths(dir_package_include, 'eina')
+ install_dir : dir_package_include / 'eina'
)
package_header_subdirs += 'eina'
diff --git a/src/lib/eio/meson.build b/src/lib/eio/meson.build
index 869f62b586..4f672b5fd2 100644
--- a/src/lib/eio/meson.build
+++ b/src/lib/eio/meson.build
@@ -14,10 +14,9 @@ foreach eo_file : pub_eo_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(
- meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EIO_API',
'-gchd', '@INPUT@'])
endforeach
@@ -88,7 +87,7 @@ eio = declare_dependency(
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)
+ install_dir: eolian_include_dir / package_version_name
)
endif
diff --git a/src/lib/eldbus/meson.build b/src/lib/eldbus/meson.build
index ea3d6930c9..4db6a640c3 100644
--- a/src/lib/eldbus/meson.build
+++ b/src/lib/eldbus/meson.build
@@ -20,9 +20,9 @@ foreach eo_file : pub_eo_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-gchd', '@INPUT@'])
endforeach
@@ -39,8 +39,8 @@ foreach eo_file : pub_eo_types_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-ghd', '@INPUT@'])
endforeach
@@ -116,7 +116,7 @@ eldbus = declare_dependency(
#
#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)
+# install_dir: eolian_include_dir / package_version_name
# )
#endif
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 5f3aa4720a..f91f57efd9 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -32,9 +32,9 @@ foreach eo_file : pub_legacy_eo_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-gchd', '@INPUT@'])
endforeach
@@ -200,9 +200,9 @@ foreach eo_file : pub_eo_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-gchd', '@INPUT@'])
endforeach
@@ -220,9 +220,9 @@ foreach eo_file : pub_eo_types_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-gchd', '@INPUT@'])
endforeach
@@ -250,9 +250,9 @@ foreach eo_file : priv_eo_files
output : [eo_file + '.h'],
depfile : eo_file + '.d',
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-gchd', '@INPUT@'])
endforeach
@@ -261,7 +261,7 @@ eolian_include_directories += ['-I', meson.current_source_dir()]
embed_script = find_program('config_embed')
embed_config = custom_target('create_embedded_default_config',
- input: join_paths(meson.source_root(), 'data', 'elementary', 'config', 'standard', 'base.src.in'),
+ input: meson.source_root() / 'data/elementary/config/standard/base.src.in',
output: 'elm_default_config.x',
command: [embed_script, '@INPUT@', '@OUTPUT@']
)
@@ -956,9 +956,9 @@ elementary_ext_deps = [atspi, dl, intl, buildsystem_simple]
elm_options = configuration_data()
config_h.set_quoted('ELM_TOP_BUILD_DIR', meson.build_root())
-config_h.set_quoted('MODULES_PATH', join_paths(dir_lib, 'modules'))
+config_h.set_quoted('MODULES_PATH', dir_lib / 'modules')
config_h.set_quoted('ELEMENTARY_BASE_DIR', get_option('elementary-base-dir'))
-config_h.set_quoted('ICON_DIR', join_paths(dir_lib, 'icons'))
+config_h.set_quoted('ICON_DIR', dir_lib / 'icons')
if sys_windows == false
elm_options.set('ELM_UNIX', '1')
@@ -987,7 +987,7 @@ if get_option('wl')
config_h.set('HAVE_ELEMENTARY_WL2', '1')
elementary_deps += ecore_wl2
elementary_ext_deps += declare_dependency(
- include_directories: include_directories([join_paths('..', '..', 'modules', 'ecore_evas', 'engines', 'wayland'), join_paths('..', '..', 'lib', 'ecore_wl2')]),
+ include_directories: include_directories('../../modules/ecore_evas/engines/wayland', '../../lib/ecore_wl2'),
dependencies : ecore_wl2_internal_headers
)
endif
@@ -1018,7 +1018,7 @@ elm_package_c_args = package_c_args
elementary_lib = library('elementary',
elementary_src, pub_eo_file_target, priv_eo_file_target, c, embed_config,
dependencies: elementary_pub_deps + elementary_deps + elementary_ext_deps,
- include_directories : config_dir + [include_directories('.')] + [include_directories(join_paths('..', '..', '..'))],
+ include_directories : config_dir + [include_directories('.')] + [include_directories('../../..')],
install: true,
c_args : elm_package_c_args,
version : meson.project_version()
@@ -1033,7 +1033,7 @@ elementary = declare_dependency(
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)
+ install_dir: eolian_include_dir / package_version_name
)
endif
@@ -1043,4 +1043,4 @@ install_headers(elementary_header_src,
elementary_config_dir = include_directories('.')
-package_pc_variables = ['themes='+join_paths(dir_data, package_name, 'themes')]
+package_pc_variables = ['themes=' + dir_data / package_name / 'themes']
diff --git a/src/lib/elua/meson.build b/src/lib/elua/meson.build
index 227d211584..e69216104d 100644
--- a/src/lib/elua/meson.build
+++ b/src/lib/elua/meson.build
@@ -7,7 +7,7 @@ elua_header_src = ['Elua.h']
elua_lib = library('elua',
elua_src,
dependencies: [m, dl] + elua_deps + elua_pub_deps,
- include_directories : config_dir + [include_directories(join_paths('..','..'))],
+ include_directories : config_dir + [include_directories('../..')],
install: true,
c_args : package_c_args,
version : meson.project_version()
diff --git a/src/lib/embryo/meson.build b/src/lib/embryo/meson.build
index e0bb2385f9..85b041e1f3 100644
--- a/src/lib/embryo/meson.build
+++ b/src/lib/embryo/meson.build
@@ -20,7 +20,7 @@ embryo_src = files([
embryo_lib = library('embryo',
embryo_src,
dependencies: [embryo_deps, embryo_pub_deps, embryo_ext_deps],
- include_directories : config_dir + [include_directories(join_paths('..','..'))],
+ include_directories : config_dir + [include_directories('../..')],
install: true,
c_args : package_c_args,
version : meson.project_version()
diff --git a/src/lib/emotion/meson.build b/src/lib/emotion/meson.build
index 21e50df4bc..19764dafa5 100644
--- a/src/lib/emotion/meson.build
+++ b/src/lib/emotion/meson.build
@@ -13,9 +13,9 @@ foreach eo_file : pub_eo_file
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EMOTION_API',
'-gchd', '@INPUT@'])
endforeach
@@ -68,7 +68,7 @@ emotion = declare_dependency(
if get_option('install-eo-files')
install_data(pub_eo_file,
- install_dir: join_paths(eolian_include_dir, package_version_name)
+ install_dir: eolian_include_dir / package_version_name
)
endif
diff --git a/src/lib/eo/meson.build b/src/lib/eo/meson.build
index 61027926b3..2925a2d517 100644
--- a/src/lib/eo/meson.build
+++ b/src/lib/eo/meson.build
@@ -35,9 +35,9 @@ foreach eo_file : pub_eo_types_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EO_API',
'-gchd', '@INPUT@'])
endforeach
@@ -52,9 +52,9 @@ foreach eo_file : pub_eo_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EO_API',
'-gchd', '@INPUT@'])
endforeach
@@ -93,7 +93,7 @@ eo_dbg = declare_dependency(
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)
+ install_dir: eolian_include_dir / package_version_name
)
endif
diff --git a/src/lib/eolian/meson.build b/src/lib/eolian/meson.build
index 0099c18192..fc2b8cb9a1 100644
--- a/src/lib/eolian/meson.build
+++ b/src/lib/eolian/meson.build
@@ -49,12 +49,12 @@ eolian = declare_dependency(
dependencies: eina,
)
-eolian_include_dir = join_paths(dir_data, 'eolian', 'include')
+eolian_include_dir = dir_data / 'eolian/include'
eolian_header_src = [
-'eolian_api.h',
-'Eolian.h',
-'Eolian_Aux.h'
+ 'eolian_api.h',
+ 'Eolian.h',
+ 'Eolian_Aux.h'
]
install_headers(eolian_header_src,
diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build
index 09320e690d..5afcb66355 100644
--- a/src/lib/evas/canvas/meson.build
+++ b/src/lib/evas/canvas/meson.build
@@ -59,9 +59,9 @@ foreach eo_file : priv_eo_files
output : [eo_file + '.h'],
depfile : eo_file + '.d',
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EVAS_API',
'-gchd', '@INPUT@'])
endforeach
@@ -76,11 +76,11 @@ foreach eo_file : pub_eo_files
output : [eo_file + '.h'],
depfile : eo_file + '.d',
install : true,
- install_dir : join_paths(dir_package_include, 'canvas'),
+ install_dir : dir_package_include / 'canvas',
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EVAS_API',
'-gchd', '@INPUT@'])
endforeach
@@ -99,10 +99,10 @@ foreach eo_file : pub_eo_types_files
output : [eo_file + '.h'],
depfile : eo_file + '.d',
install : true,
- install_dir : join_paths(dir_package_include, 'canvas'),
+ install_dir : dir_package_include / 'canvas',
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EVAS_API',
'-ghd', '@INPUT@'])
endforeach
@@ -212,7 +212,7 @@ evas_src += files([
evas_include_directories += include_directories('.')
install_headers(['evas_textblock_legacy.h', evas_legacy_h],
- install_dir : join_paths(dir_package_include, 'canvas'),
+ install_dir : dir_package_include / 'canvas',
)
pub_eo_types_files = []
diff --git a/src/lib/evas/filters/lua/meson.build b/src/lib/evas/filters/lua/meson.build
index 26658feae7..daf01fedd6 100644
--- a/src/lib/evas/filters/lua/meson.build
+++ b/src/lib/evas/filters/lua/meson.build
@@ -1,3 +1,3 @@
install_data('color.lua',
- install_dir : join_paths(dir_data, 'evas', 'filters', 'lua')
+ install_dir : dir_data / 'evas/filters/lua'
)
\ No newline at end of file
diff --git a/src/lib/evas/gesture/meson.build b/src/lib/evas/gesture/meson.build
index bc761d4674..8355d2564b 100644
--- a/src/lib/evas/gesture/meson.build
+++ b/src/lib/evas/gesture/meson.build
@@ -33,11 +33,11 @@ foreach eo_file : pub_eo_files
output : [eo_file + '.h'],
depfile : eo_file + '.d',
install : true,
- install_dir : join_paths(dir_package_include, 'gesture'),
+ install_dir : dir_package_include / 'gesture',
command : eolian_gen + ['-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EVAS_API',
'-gchd', '@INPUT@'])
endforeach
@@ -58,10 +58,10 @@ foreach eo_file : pub_eo_types_files
output : [eo_file + '.h'],
depfile : eo_file + '.d',
install : true,
- install_dir : join_paths(dir_package_include, 'gesture'),
+ install_dir : dir_package_include / 'gesture',
command : eolian_gen + ['-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EVAS_API',
'-ghd', '@INPUT@'])
endforeach
diff --git a/src/lib/evas/include/meson.build b/src/lib/evas/include/meson.build
index 6e8273fcac..138983912f 100644
--- a/src/lib/evas/include/meson.build
+++ b/src/lib/evas/include/meson.build
@@ -11,9 +11,9 @@ foreach eo_file : pub_eo_files
output : [eo_file + '.h'],
depfile : eo_file + '.d',
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EVAS_API',
'-gchd', '@INPUT@'])
endforeach
diff --git a/src/lib/evas/meson.build b/src/lib/evas/meson.build
index 03bc02aa95..1ee256ad73 100644
--- a/src/lib/evas/meson.build
+++ b/src/lib/evas/meson.build
@@ -59,7 +59,7 @@ evas_vg_loaders_file = [
evas_vg_savers_file = ['eet', 'svg']
-rel_evas_modules = join_paths('..', '..', '..', 'modules', 'evas', 'engines', 'software_generic')
+rel_evas_modules = '../../../modules/evas/engines/software_generic'
evas_deps = [eo, eet, eina, efl, emile, ector, ecore, draw, buildsystem]
evas_ext_deps = [vg_common, draw_simple]
evas_ext_none_static_deps = [buildsystem_simple, intl, m, valgrind, libunibreak, lua]
@@ -71,9 +71,7 @@ pub_eo_files = []
pub_evas_eo_files = []
pub_evas_eot_files = []
-pub_legacy_eo_files = [
-
-]
+pub_legacy_eo_files = []
evas_src = []
subdir('software_generic')
@@ -86,9 +84,9 @@ foreach eo_file : pub_legacy_eo_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EVAS_API',
'-gchd', '@INPUT@'])
endforeach
@@ -101,9 +99,9 @@ foreach eo_file : pub_eo_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EVAS_API',
'-gchd', '@INPUT@'])
endforeach
@@ -121,8 +119,8 @@ foreach eo_file : pub_eo_types_files
install : true,
install_dir : dir_package_include,
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EVAS_API',
'-ghd', '@INPUT@'])
endforeach
@@ -261,7 +259,7 @@ foreach loader_inst : evas_image_loaders_file
if get_option('evas-loaders-disabler').contains(loader) == false
if loader_type == 'static'
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
- file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_loaders', loader, 'evas_image_load_'+loader+'.c')
+ file = meson.source_root() / 'src/modules/evas/image_loaders/' / loader / 'evas_image_load_'+loader+'.c'
config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
evas_static_list += [declare_dependency(
sources: file,
@@ -280,7 +278,7 @@ foreach loader_inst : evas_image_savers_file
if get_option('evas-loaders-disabler').contains(loader) == false
if loader_type == 'static'
config_h.set('BUILD_LOADER_'+loader.to_upper(), '1')
- file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'image_savers', loader, 'evas_image_save_'+loader+'.c')
+ file = meson.source_root() / 'src/modules/evas/image_savers' / loader / 'evas_image_save_'+loader+'.c'
config_h.set('EVAS_STATIC_BUILD_'+loader.to_upper(), '1')
evas_static_list += [declare_dependency(
sources: file,
@@ -297,7 +295,7 @@ foreach loader_inst : evas_vg_loaders_file
loader_deps = loader_inst[1]
if (get_option('evas-loaders-disabler').contains(loader) == false)
- file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'vg_loaders', loader, 'evas_vg_load_'+loader+'.c')
+ file = meson.source_root() / 'src/modules/evas/vg_loaders' / loader / 'evas_vg_load_'+loader+'.c'
evas_static_list += [declare_dependency(
sources: file,
dependencies: loader_deps,
@@ -308,7 +306,7 @@ endforeach
foreach loader : evas_vg_savers_file
if (get_option('evas-loaders-disabler').contains(loader) == false)
- file = join_paths(meson.source_root(), 'src', 'modules', 'evas', 'vg_savers', loader, 'evas_vg_save_'+loader+'.c')
+ file = meson.source_root() / 'src/modules/evas/vg_savers' / loader / 'evas_vg_save_'+loader+'.c'
evas_static_list += [declare_dependency(
sources: file,
dependencies: [eo, ector, emile, freetype, eet],
@@ -339,7 +337,7 @@ evas = declare_dependency(
link_with : [evas_lib],
sources: pub_eo_file_target,
dependencies : evas_pub_deps,
- include_directories: evas_include_directories + [vg_common_inc_dir] + [include_directories(join_paths('..', '..', 'modules', 'evas', 'engines', 'buffer'))],
+ include_directories: evas_include_directories + [vg_common_inc_dir] + [include_directories('../../modules/evas/engines/buffer')],
)
evas_bin = declare_dependency(
@@ -350,7 +348,7 @@ evas_bin = declare_dependency(
if get_option('install-eo-files')
install_data(pub_evas_eo_files + pub_evas_eot_files,
- install_dir: join_paths(eolian_include_dir, package_version_name)
+ install_dir: eolian_include_dir / package_version_name
)
endif
diff --git a/src/lib/evas/software_generic/filters/meson.build b/src/lib/evas/software_generic/filters/meson.build
index abe0594c99..0bec7db860 100644
--- a/src/lib/evas/software_generic/filters/meson.build
+++ b/src/lib/evas/software_generic/filters/meson.build
@@ -1,4 +1,4 @@
-evas_include_directories += include_directories(join_paths('..', rel_evas_modules, 'filters'))
+evas_include_directories += include_directories('..' / rel_evas_modules / 'filters')
raw_evas_src = [
'evas_engine_filter.h',
@@ -15,5 +15,5 @@ raw_evas_src = [
]
foreach file : raw_evas_src
- evas_src += files(join_paths('..', rel_evas_modules, 'filters', file))
+ evas_src += files('..' / rel_evas_modules / 'filters' / file)
endforeach
diff --git a/src/lib/evas/software_generic/meson.build b/src/lib/evas/software_generic/meson.build
index 76d589ce0b..fe215d9747 100644
--- a/src/lib/evas/software_generic/meson.build
+++ b/src/lib/evas/software_generic/meson.build
@@ -17,21 +17,21 @@ raw_pub_eo_files = [
foreach eo_file : raw_pub_eo_files
pub_eo_file_target += custom_target('eolian_gen_' + eo_file.underscorify(),
- input : join_paths(rel_evas_modules, eo_file),
+ input : rel_evas_modules / eo_file,
output : [eo_file + '.h'],
depfile : eo_file + '.d',
install : true,
install_dir : dir_package_include,
- command : eolian_gen + [ '-I', join_paths(meson.current_source_dir(), rel_evas_modules), eolian_include_directories,
- '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
- '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
- '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
+ command : eolian_gen + [ '-I', meson.current_source_dir() / rel_evas_modules, eolian_include_directories,
+ '-o', 'h:' + meson.current_build_dir() / eo_file + '.h',
+ '-o', 'c:' + meson.current_build_dir() / eo_file + '.c',
+ '-o', 'd:' + meson.current_build_dir() / eo_file + '.d',
'-e', 'EVAS_API',
'-gchd', '@INPUT@'])
endforeach
foreach file : raw_evas_src
- evas_src += files(join_paths(rel_evas_modules, file))
+ evas_src += files(rel_evas_modules / file)
endforeach
evas_include_directories += include_directories('.')
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
