From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 11 Jul 2022 05:44:15 +0000 (+1000)
Subject: meson.build: drop the use of join_paths
X-Git-Tag: accepted/tizen/unified/20231121.102917~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed51ec89f4342b84fbafa101bbf5ea8557ff0fe3;p=platform%2Fupstream%2Flibevdev.git

meson.build: drop the use of join_paths

Replace with the slash notation supported since 0.49

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---

diff --git a/meson.build b/meson.build
index af466b1..1cbe7f5 100644
--- a/meson.build
+++ b/meson.build
@@ -7,8 +7,8 @@ project('libevdev', 'c',
 libevdev_version = meson.project_version().split('.')
 
 dir_root        = meson.project_source_root()
-dir_src         = join_paths(dir_root, 'libevdev')
-dir_src_test    = join_paths(dir_root, 'test')
+dir_src         = dir_root / 'libevdev'
+dir_src_test    = dir_root / 'test'
 
 # Include directories
 includes_include = include_directories('include')
@@ -40,9 +40,9 @@ pkgconfig = import('pkgconfig')
 dep_lm = cc.find_library('m')
 dep_rt = cc.find_library('rt')
 
-input_h = join_paths(dir_root, 'include', 'linux', host_machine.system(), 'input.h')
-uinput_h = join_paths(dir_root, 'include', 'linux', host_machine.system(), 'uinput.h')
-input_event_codes_h = join_paths(dir_root, 'include', 'linux', host_machine.system(), 'input-event-codes.h')
+input_h = dir_root / 'include' / 'linux' / host_machine.system() / 'input.h'
+uinput_h = dir_root / 'include' / 'linux' / host_machine.system() / 'uinput.h'
+input_event_codes_h = dir_root / 'include' / 'linux' / host_machine.system() / 'input-event-codes.h'
 
 # event-names.h
 make_event_names = find_program('libevdev/make-event-names.py')
@@ -73,7 +73,7 @@ src_libevdev = [
 	uinput_h
 ]
 
-mapfile = join_paths(dir_src, 'libevdev.sym')
+mapfile = dir_src / 'libevdev.sym'
 version_flag = '-Wl,--version-script,@0@'.format(mapfile)
 lib_libevdev = library('evdev',
 	src_libevdev,
@@ -215,7 +215,7 @@ if dep_check.found()
 		valgrind_env.set('CK_TIMEOUT_MULTIPLIER', '10')
 		valgrind_env.set('CK_FORK', 'no')
 		valgrind_env.set('RUNNING_ON_VALGRIND', '1')
-		valgrind_suppressions_file = join_paths(dir_src_test, 'valgrind.suppressions')
+		valgrind_suppressions_file = dir_src_test / 'valgrind.suppressions'
 		add_test_setup('valgrind',
 				exe_wrapper: [ valgrind,
 						'--leak-check=full',
@@ -240,8 +240,8 @@ if doxygen.found()
 
 	src_doxygen = files(
 		# source files
-		join_paths(dir_src, 'libevdev.h'),
-		join_paths(dir_src, 'libevdev-uinput.h'),
+		dir_src / 'libevdev.h',
+		dir_src / 'libevdev-uinput.h',
 		# style files
 		'doc/style/bootstrap.css',
 		'doc/style/customdoxygen.css',
@@ -268,7 +268,7 @@ if doxygen.found()
 	doc_config.set('PACKAGE_VERSION', meson.project_version())
 	doc_config.set('builddir', meson.current_build_dir())
 	doc_config.set('top_srcdir', dir_root)
-	doc_config.set('srcdir', join_paths(dir_root, 'doc'))
+	doc_config.set('srcdir', dir_root / 'doc')
 
 	doxyfile = configure_file(input: 'doc/libevdev.doxygen.in',
 				  output: 'libevdev.doxygen',