From a923e085af00dfd47eafbbd6964398a10e5a4f19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 17 Apr 2017 19:48:20 -0400 Subject: [PATCH] meson: use run_target instead of custom_target where appropriate This way a fake output does not need to be specified. --- hwdb/meson.build | 3 +-- man/meson.build | 39 ++++++++++++++++++++------------------- meson.build | 3 +-- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/hwdb/meson.build b/hwdb/meson.build index b9fc5ab5942..d6e858311a6 100644 --- a/hwdb/meson.build +++ b/hwdb/meson.build @@ -31,7 +31,6 @@ endif ############################################################ -custom_target( +run_target( 'update', - output : 'update', command : [hwdb_update_sh, meson.current_source_dir()]) diff --git a/man/meson.build b/man/meson.build index 1c1dbd86b74..79d7710d11b 100644 --- a/man/meson.build +++ b/man/meson.build @@ -130,24 +130,25 @@ foreach tuple : [['systemd.directives', '7', systemd_directives_xml], html_pages += [p2] endforeach -man = custom_target('man', - depends : man_pages, - output : 'man', - command : ['echo']) +man = run_target( + 'man', + depends : man_pages, + command : ['echo']) -html = custom_target('html', - depends : html_pages, - output : 'html', - command : ['echo']) +html = run_target( + 'html', + depends : html_pages, + output : 'html', + command : ['echo']) -custom_target('doc-sync', - depends : [man, html], - output : ['doc-sync'], - command : ['rsync', '-rlv', - '--delete-excluded', - '--include=man', - '--include=*.html', - '--exclude=*', - '--omit-dir-times', - meson.current_build_dir(), - get_option('www-target')]) +run_target( + 'doc-sync', + depends : man_pages + html_pages, + command : ['rsync', '-rlv', + '--delete-excluded', + '--include=man', + '--include=*.html', + '--exclude=*', + '--omit-dir-times', + meson.current_build_dir(), + get_option('www-target')]) diff --git a/meson.build b/meson.build index b1deb321445..4690619e54c 100644 --- a/meson.build +++ b/meson.build @@ -2278,8 +2278,7 @@ endif if git.found() meson_git_contrib_sh = find_program('tools/meson-git-contrib.sh') - custom_target( + run_target( 'git-contrib', - output : 'git-contrib', command : [meson_git_contrib_sh]) endif