Make style more consistent
This commit is contained in:
parent
869dca1bce
commit
a2bbf2c1f7
20
meson.build
20
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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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],
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue