summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meson.build18
-rwxr-xr-xtools/autosuspend-update.sh (renamed from tools/meson-autosuspend-update.sh)0
-rwxr-xr-xtools/check-api-docs.sh (renamed from tools/meson-check-api-docs.sh)0
-rwxr-xr-xtools/check-compilation.sh (renamed from tools/meson-check-compilation.sh)0
-rwxr-xr-xtools/check-help.sh (renamed from tools/meson-check-help.sh)0
-rwxr-xr-xtools/git-contrib.sh (renamed from tools/meson-git-contrib.sh)0
-rwxr-xr-xtools/hwdb-update.sh (renamed from tools/meson-hwdb-update.sh)0
7 files changed, 9 insertions, 9 deletions
diff --git a/meson.build b/meson.build
index a922f9a2f1..28494c9af2 100644
--- a/meson.build
+++ b/meson.build
@@ -299,7 +299,7 @@ substs.set('BUILD_ROOT', project_build_root
cc = meson.get_compiler('c')
pkgconfig = import('pkgconfig')
-check_compilation_sh = find_program('tools/meson-check-compilation.sh')
+check_compilation_sh = find_program('tools/check-compilation.sh')
meson_build_sh = find_program('tools/meson-build.sh')
want_tests = get_option('tests')
@@ -3244,8 +3244,8 @@ run_target(
make_directive_index_py = find_program('tools/make-directive-index.py')
make_man_index_py = find_program('tools/make-man-index.py')
xml_helper_py = find_program('tools/xml_helper.py')
-hwdb_update_sh = find_program('tools/meson-hwdb-update.sh')
-autosuspend_update_sh = find_program('tools/meson-autosuspend-update.sh')
+hwdb_update_sh = find_program('tools/hwdb-update.sh')
+autosuspend_update_sh = find_program('tools/autosuspend-update.sh')
subdir('sysctl.d')
subdir('sysusers.d')
@@ -3286,13 +3286,13 @@ meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir))
############################################################
-meson_check_help = find_program('tools/meson-check-help.sh')
+check_help = find_program('tools/check-help.sh')
foreach exec : public_programs
name = exec.full_path().split('/')[-1]
if want_tests != 'false'
test('check-help-' + name,
- meson_check_help,
+ check_help,
args : exec.full_path())
endif
endforeach
@@ -3371,10 +3371,10 @@ if git.found()
endif
if git.found()
- meson_git_contrib_sh = find_program('tools/meson-git-contrib.sh')
+ git_contrib_sh = find_program('tools/git-contrib.sh')
run_target(
'git-contrib',
- command : [meson_git_contrib_sh])
+ command : [git_contrib_sh])
endif
if git.found()
@@ -3398,11 +3398,11 @@ endif
############################################################
-meson_check_api_docs_sh = find_program('tools/meson-check-api-docs.sh')
+check_api_docs_sh = find_program('tools/check-api-docs.sh')
run_target(
'check-api-docs',
depends : [man, libsystemd, libudev],
- command : [meson_check_api_docs_sh, libsystemd.full_path(), libudev.full_path()])
+ command : [check_api_docs_sh, libsystemd.full_path(), libudev.full_path()])
############################################################
watchdog_opt = service_watchdog == '' ? 'disabled' : service_watchdog
diff --git a/tools/meson-autosuspend-update.sh b/tools/autosuspend-update.sh
index a4f99eb6b3..a4f99eb6b3 100755
--- a/tools/meson-autosuspend-update.sh
+++ b/tools/autosuspend-update.sh
diff --git a/tools/meson-check-api-docs.sh b/tools/check-api-docs.sh
index 1094101e08..1094101e08 100755
--- a/tools/meson-check-api-docs.sh
+++ b/tools/check-api-docs.sh
diff --git a/tools/meson-check-compilation.sh b/tools/check-compilation.sh
index ce39e1684b..ce39e1684b 100755
--- a/tools/meson-check-compilation.sh
+++ b/tools/check-compilation.sh
diff --git a/tools/meson-check-help.sh b/tools/check-help.sh
index efe7ed4e56..efe7ed4e56 100755
--- a/tools/meson-check-help.sh
+++ b/tools/check-help.sh
diff --git a/tools/meson-git-contrib.sh b/tools/git-contrib.sh
index b40e97ba62..b40e97ba62 100755
--- a/tools/meson-git-contrib.sh
+++ b/tools/git-contrib.sh
diff --git a/tools/meson-hwdb-update.sh b/tools/hwdb-update.sh
index 39efd75192..39efd75192 100755
--- a/tools/meson-hwdb-update.sh
+++ b/tools/hwdb-update.sh