meson: use run_target instead of custom_target where appropriate

This way a fake output does not need to be specified.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-04-17 19:48:20 -04:00
parent 1aec3ed90d
commit a923e085af
3 changed files with 22 additions and 23 deletions

View File

@ -31,7 +31,6 @@ endif
############################################################ ############################################################
custom_target( run_target(
'update', 'update',
output : 'update',
command : [hwdb_update_sh, meson.current_source_dir()]) command : [hwdb_update_sh, meson.current_source_dir()])

View File

@ -130,24 +130,25 @@ foreach tuple : [['systemd.directives', '7', systemd_directives_xml],
html_pages += [p2] html_pages += [p2]
endforeach endforeach
man = custom_target('man', man = run_target(
depends : man_pages, 'man',
output : 'man', depends : man_pages,
command : ['echo']) command : ['echo'])
html = custom_target('html', html = run_target(
depends : html_pages, 'html',
output : 'html', depends : html_pages,
command : ['echo']) output : 'html',
command : ['echo'])
custom_target('doc-sync', run_target(
depends : [man, html], 'doc-sync',
output : ['doc-sync'], depends : man_pages + html_pages,
command : ['rsync', '-rlv', command : ['rsync', '-rlv',
'--delete-excluded', '--delete-excluded',
'--include=man', '--include=man',
'--include=*.html', '--include=*.html',
'--exclude=*', '--exclude=*',
'--omit-dir-times', '--omit-dir-times',
meson.current_build_dir(), meson.current_build_dir(),
get_option('www-target')]) get_option('www-target')])

View File

@ -2278,8 +2278,7 @@ endif
if git.found() if git.found()
meson_git_contrib_sh = find_program('tools/meson-git-contrib.sh') meson_git_contrib_sh = find_program('tools/meson-git-contrib.sh')
custom_target( run_target(
'git-contrib', 'git-contrib',
output : 'git-contrib',
command : [meson_git_contrib_sh]) command : [meson_git_contrib_sh])
endif endif