diff options
| author | Scott Anderson <scott@anderso.nz> | 2018-08-22 21:03:38 +1200 |
|---|---|---|
| committer | Scott Anderson <scott@anderso.nz> | 2018-08-22 21:16:16 +1200 |
| commit | a2bbf2c1f70ef374ff4a2506e65379c819b72414 (patch) | |
| tree | e4018cf9032f74afe4e789c60873d8df6047d171 | |
| parent | 869dca1bce662e685a83a33f7550644817265fb9 (diff) | |
Make style more consistent
| -rw-r--r-- | meson.build | 20 | ||||
| -rw-r--r-- | protocol/meson.build | 7 | ||||
| -rw-r--r-- | render/meson.build | 6 |
3 files changed, 20 insertions, 13 deletions
diff --git a/meson.build b/meson.build index db2e13e8..d31296f7 100644 --- a/meson.build +++ b/meson.build @@ -135,7 +135,6 @@ wlroots = declare_dependency( include_directories: wlr_inc, ) - summary = [ '', '----------------', @@ -169,26 +168,31 @@ git = find_program('git', required: false) if git.found() all_files = run_command( git, - ['--git-dir=@0@/.git'.format(meson.current_source_dir()), - 'ls-files', - ':/*.[ch]']) + '--git-dir=@0@/.git'.format(meson.current_source_dir()), + 'ls-files', + ':/*.[ch]', + ) all_files = files(all_files.stdout().split()) etags = find_program('etags', required: false) if etags.found() and all_files.length() > 0 - custom_target('etags', + custom_target( + 'etags', build_by_default: true, input: all_files, output: 'TAGS', - command: [etags.path(), '-o', 'TAGS'] + all_files) + command: [etags, '-o', '@OUTPUT@', '@INPUT@'], + ) endif ctags = find_program('ctags', required: false) if ctags.found() and all_files.length() > 0 - custom_target('ctags', + custom_target( + 'ctags', build_by_default: true, input: all_files, output: 'tags', - command: [ctags.path(), '-f', 'tags'] + all_files) + command: [ctags, '-f', '@OUTPUT@', '@INPUT@'], + ) endif endif diff --git a/protocol/meson.build b/protocol/meson.build index 73a3156a..58126561 100644 --- a/protocol/meson.build +++ b/protocol/meson.build @@ -76,8 +76,11 @@ foreach p : client_protocols wl_protos_headers += wayland_scanner_client.process(xml) endforeach -lib_wl_protos = static_library('wl_protos', wl_protos_src + wl_protos_headers, - dependencies: [wayland_client]) # for the include directory +lib_wl_protos = static_library( + 'wl_protos', + wl_protos_src + wl_protos_headers, + dependencies: wayland_client.partial_dependency(includes: true), +) wlr_protos = declare_dependency( link_with: lib_wl_protos, diff --git a/render/meson.build b/render/meson.build index 4b90c229..c5401d22 100644 --- a/render/meson.build +++ b/render/meson.build @@ -1,6 +1,7 @@ glgen = find_program('../glgen.sh') -glapi = custom_target('glapi', +glapi = custom_target( + 'glapi', input: 'glapi.txt', output: ['@BASENAME@.c', '@BASENAME@.h'], command: [glgen, '@INPUT@', '@OUTPUT0@', '@OUTPUT1@'], @@ -19,8 +20,7 @@ lib_wlr_render = static_library( 'wlr_renderer.c', 'wlr_texture.c', ), - glapi[0], - glapi[1], + glapi, include_directories: wlr_inc, dependencies: [egl, glesv2, pixman, wayland_server], ) |