blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make style more consistent

This commit is contained in:
Scott Anderson 2018-08-22 21:03:38 +12:00
parent 869dca1bce
commit a2bbf2c1f7
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meson.build
View File

@ -135,7 +135,6 @@ wlroots = declare_dependency(
include_directories: wlr_inc, include_directories: wlr_inc,
) )
summary = [ summary = [
'', '',
'----------------', '----------------',
@ -169,26 +168,31 @@ git = find_program('git', required: false)
if git.found() if git.found()
all_files = run_command( all_files = run_command(
git, git,
['--git-dir=@0@/.git'.format(meson.current_source_dir()), '--git-dir=@0@/.git'.format(meson.current_source_dir()),
'ls-files', 'ls-files',
':/*.[ch]']) ':/*.[ch]',
)
all_files = files(all_files.stdout().split()) all_files = files(all_files.stdout().split())
etags = find_program('etags', required: false) etags = find_program('etags', required: false)
if etags.found() and all_files.length() > 0 if etags.found() and all_files.length() > 0
custom_target('etags', custom_target(
'etags',
build_by_default: true, build_by_default: true,
input: all_files, input: all_files,
output: 'TAGS', output: 'TAGS',
command: [etags.path(), '-o', 'TAGS'] + all_files) command: [etags, '-o', '@OUTPUT@', '@INPUT@'],
)
endif endif
ctags = find_program('ctags', required: false) ctags = find_program('ctags', required: false)
if ctags.found() and all_files.length() > 0 if ctags.found() and all_files.length() > 0
custom_target('ctags', custom_target(
'ctags',
build_by_default: true, build_by_default: true,
input: all_files, input: all_files,
output: 'tags', output: 'tags',
command: [ctags.path(), '-f', 'tags'] + all_files) command: [ctags, '-f', '@OUTPUT@', '@INPUT@'],
)
endif endif
endif endif

7
protocol/meson.build
View File

@ -76,8 +76,11 @@ foreach p : client_protocols
wl_protos_headers += wayland_scanner_client.process(xml) wl_protos_headers += wayland_scanner_client.process(xml)
endforeach endforeach
lib_wl_protos = static_library('wl_protos', wl_protos_src + wl_protos_headers, lib_wl_protos = static_library(
dependencies: [wayland_client]) # for the include directory 'wl_protos',
wl_protos_src + wl_protos_headers,
dependencies: wayland_client.partial_dependency(includes: true),
)
wlr_protos = declare_dependency( wlr_protos = declare_dependency(
link_with: lib_wl_protos, link_with: lib_wl_protos,

6
render/meson.build
View File

@ -1,6 +1,7 @@
glgen = find_program('../glgen.sh') glgen = find_program('../glgen.sh')
glapi = custom_target('glapi', glapi = custom_target(
'glapi',
input: 'glapi.txt', input: 'glapi.txt',
output: ['@BASENAME@.c', '@BASENAME@.h'], output: ['@BASENAME@.c', '@BASENAME@.h'],
command: [glgen, '@INPUT@', '@OUTPUT0@', '@OUTPUT1@'], command: [glgen, '@INPUT@', '@OUTPUT0@', '@OUTPUT1@'],
@ -19,8 +20,7 @@ lib_wlr_render = static_library(
'wlr_renderer.c', 'wlr_renderer.c',
'wlr_texture.c', 'wlr_texture.c',
), ),
glapi[0], glapi,
glapi[1],
include_directories: wlr_inc, include_directories: wlr_inc,
dependencies: [egl, glesv2, pixman, wayland_server], dependencies: [egl, glesv2, pixman, wayland_server],
) )