diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-17 19:48:20 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-23 21:47:29 -0400 |
| commit | a923e085af00dfd47eafbbd6964398a10e5a4f19 (patch) | |
| tree | b502f3c8562f198b7263c675a684968df86c5333 | |
| parent | 1aec3ed90d553482918b283e52b82918d7f5a388 (diff) | |
meson: use run_target instead of custom_target where appropriate
This way a fake output does not need to be specified.
| -rw-r--r-- | hwdb/meson.build | 3 | ||||
| -rw-r--r-- | man/meson.build | 43 | ||||
| -rw-r--r-- | meson.build | 3 |
3 files changed, 24 insertions, 25 deletions
diff --git a/hwdb/meson.build b/hwdb/meson.build index b9fc5ab594..d6e858311a 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 1c1dbd86b7..79d7710d11 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']) - -html = custom_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')]) +man = run_target( + 'man', + depends : man_pages, + command : ['echo']) + +html = run_target( + 'html', + depends : html_pages, + output : 'html', + command : ['echo']) + +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 b1deb32144..4690619e54 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 |