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

Refactor meson build files 

Use tabs for indentation and break up function calls over 80 col.
This commit is contained in:
Tony Crisci 2017-08-30 14:30:47 -04:00
parent 6daf9e9ab2
commit 368f74e4df
9 changed files with 209 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
backend/meson.build
View File

@ -1,33 +1,36 @@
backend_files = files( backend_files = files(
'backend.c', 'backend.c',
'session/direct-ipc.c', 'session/direct-ipc.c',
'session/direct.c', 'session/direct.c',
'session/session.c', 'session/session.c',
'drm/backend.c', 'drm/backend.c',
'drm/drm.c', 'drm/drm.c',
'drm/drm-atomic.c', 'drm/drm-atomic.c',
'drm/drm-legacy.c', 'drm/drm-legacy.c',
'drm/drm-properties.c', 'drm/drm-properties.c',
'drm/drm-util.c', 'drm/drm-util.c',
'libinput/backend.c', 'libinput/backend.c',
'libinput/events.c', 'libinput/events.c',
'libinput/keyboard.c', 'libinput/keyboard.c',
'libinput/pointer.c', 'libinput/pointer.c',
'libinput/tablet_pad.c', 'libinput/tablet_pad.c',
'libinput/tablet_tool.c', 'libinput/tablet_tool.c',
'libinput/touch.c', 'libinput/touch.c',
'multi/backend.c', 'multi/backend.c',
'wayland/backend.c', 'wayland/backend.c',
'wayland/output.c', 'wayland/output.c',
'wayland/registry.c', 'wayland/registry.c',
'wayland/wl_seat.c', 'wayland/wl_seat.c',
'wayland/os-compatibility.c', 'wayland/os-compatibility.c',
) )
if systemd.found() if systemd.found()
backend_files += files('session/logind.c') backend_files += files('session/logind.c')
endif endif
lib_wlr_backend = static_library('wlr_backend', backend_files, lib_wlr_backend = static_library(
include_directories: wlr_inc, 'wlr_backend',
dependencies: [wayland_server, egl, gbm, libinput, systemd, wlr_protos]) backend_files,
include_directories: wlr_inc,
dependencies: [wayland_server, egl, gbm, libinput, systemd, wlr_protos],
)

33
examples/meson.build
View File

@ -1,14 +1,31 @@
lib_shared = static_library('shared', lib_shared = static_library(
['shared.c', 'cat.c', 'ini.c', 'config.c'], 'shared',
dependencies: wlroots) ['shared.c', 'cat.c', 'ini.c', 'config.c'],
dependencies: wlroots,
)
executable('simple', 'simple.c', dependencies: wlroots, link_with: lib_shared) executable('simple', 'simple.c', dependencies: wlroots, link_with: lib_shared)
executable('rotation', 'rotation.c', dependencies: wlroots, link_with: lib_shared)
executable('pointer', 'pointer.c', dependencies: wlroots, link_with: lib_shared) executable('pointer', 'pointer.c', dependencies: wlroots, link_with: lib_shared)
executable('touch', 'touch.c', dependencies: wlroots, link_with: lib_shared) executable('touch', 'touch.c', dependencies: wlroots, link_with: lib_shared)
executable('tablet', 'tablet.c', dependencies: wlroots, link_with: lib_shared) executable('tablet', 'tablet.c', dependencies: wlroots, link_with: lib_shared)
executable('output-layout', 'output-layout.c', dependencies: wlroots, link_with: lib_shared)
executable('compositor', 'compositor.c', executable(
dependencies: wlroots, 'rotation',
link_with: lib_shared) 'rotation.c',
dependencies: wlroots,
link_with: lib_shared,
)
executable(
'output-layout',
'output-layout.c',
dependencies: wlroots,
link_with: lib_shared,
)
executable(
'compositor',
'compositor.c',
dependencies: wlroots,
link_with: lib_shared,
)

107
meson.build
View File

@ -1,23 +1,33 @@
project('wlroots', 'c', project(
license: 'MIT', 'wlroots',
default_options: [ 'c',
'c_std=c11', license: 'MIT',
'warning_level=2', default_options: [
'werror=true', 'c_std=c11',
]) 'warning_level=2',
'werror=true',
],
)
add_project_arguments('-Wno-unused-parameter', language: 'c') add_project_arguments('-Wno-unused-parameter', language: 'c')
add_project_arguments('-DWLR_SRC_DIR="@0@"'.format(meson.source_root()), language: 'c') add_project_arguments(
add_project_link_arguments('-Wl,-rpath,@0@'.format(meson.build_root()), language: 'c') '-DWLR_SRC_DIR="@0@"'.format(meson.source_root()),
language: 'c',
)
add_project_link_arguments(
'-Wl,-rpath,@0@'.format(meson.build_root()),
language: 'c',
)
wlr_inc = include_directories('include') wlr_inc = include_directories('include')
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
# Clang complains about some zeroed initialiser lists (= {0}), even though they are valid # Clang complains about some zeroed initialiser lists (= {0}), even though they
# are valid
if cc.get_id() == 'clang' if cc.get_id() == 'clang'
add_project_arguments('-Wno-missing-field-initializers', language: 'c') add_project_arguments('-Wno-missing-field-initializers', language: 'c')
add_project_arguments('-Wno-missing-braces', language: 'c') add_project_arguments('-Wno-missing-braces', language: 'c')
endif endif
wayland_server = dependency('wayland-server') wayland_server = dependency('wayland-server')
@ -39,11 +49,11 @@ systemd = dependency('libsystemd', required: false)
math = cc.find_library('m', required: false) math = cc.find_library('m', required: false)
if libcap.found() and get_option('enable_libcap') if libcap.found() and get_option('enable_libcap')
add_project_arguments('-DHAS_LIBCAP', language: 'c') add_project_arguments('-DHAS_LIBCAP', language: 'c')
endif endif
if systemd.found() and get_option('enable_systemd') if systemd.found() and get_option('enable_systemd')
add_project_arguments('-DHAS_SYSTEMD', language: 'c') add_project_arguments('-DHAS_SYSTEMD', language: 'c')
endif endif
subdir('protocol') subdir('protocol')
@ -55,40 +65,45 @@ subdir('xcursor')
subdir('xwayland') subdir('xwayland')
wlr_deps = [ wlr_deps = [
wayland_server, wayland_server,
wayland_client, wayland_client,
wayland_egl, wayland_egl,
wayland_protos, wayland_protos,
egl, egl,
glesv2, glesv2,
drm, drm,
gbm, gbm,
libinput, libinput,
xkbcommon, xkbcommon,
udev, udev,
pixman, pixman,
xcb, xcb,
xcb_composite, xcb_composite,
libcap, libcap,
systemd, systemd,
math, math,
] ]
lib_wlr = library('wlroots', files('dummy.c'), lib_wlr = library(
link_whole: [ 'wlroots',
lib_wl_protos, files('dummy.c'),
lib_wlr_backend, link_whole: [
lib_wlr_render, lib_wl_protos,
lib_wlr_types, lib_wlr_backend,
lib_wlr_util, lib_wlr_render,
lib_wlr_xcursor, lib_wlr_types,
lib_wlr_xwayland, lib_wlr_util,
], lib_wlr_xcursor,
dependencies: wlr_deps, lib_wlr_xwayland,
include_directories: wlr_inc) ],
dependencies: wlr_deps,
include_directories: wlr_inc,
)
wlroots = declare_dependency(link_with: lib_wlr, wlroots = declare_dependency(
dependencies: wlr_deps, link_with: lib_wlr,
include_directories: wlr_inc) dependencies: wlr_deps,
include_directories: wlr_inc,
)
subdir('examples') subdir('examples')

44
protocol/meson.build
View File

@ -2,41 +2,49 @@ wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
wayland_scanner = find_program('wayland-scanner') wayland_scanner = find_program('wayland-scanner')
wayland_scanner_server = generator(wayland_scanner, wayland_scanner_server = generator(
output: '@BASENAME@-protocol.h', wayland_scanner,
arguments: ['server-header', '@INPUT@', '@OUTPUT@']) output: '@BASENAME@-protocol.h',
arguments: ['server-header', '@INPUT@', '@OUTPUT@'],
)
wayland_scanner_code = generator(wayland_scanner, wayland_scanner_code = generator(
output: '@BASENAME@-protocol.c', wayland_scanner,
arguments: ['code', '@INPUT@', '@OUTPUT@']) output: '@BASENAME@-protocol.c',
arguments: ['code', '@INPUT@', '@OUTPUT@'],
)
wayland_scanner_client = generator(wayland_scanner, wayland_scanner_client = generator(
output: '@BASENAME@-client-protocol.h', wayland_scanner,
arguments: ['client-header', '@INPUT@', '@OUTPUT@']) output: '@BASENAME@-client-protocol.h',
arguments: ['client-header', '@INPUT@', '@OUTPUT@'],
)
protocols = [ protocols = [
[ wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml' ] [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml'],
] ]
client_protocols = [ client_protocols = [
[ wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml' ] [wl_protocol_dir, 'unstable/xdg-shell/xdg-shell-unstable-v6.xml']
] ]
wl_protos_src = [] wl_protos_src = []
wl_protos_headers = [] wl_protos_headers = []
foreach p : protocols foreach p : protocols
xml = join_paths(p) xml = join_paths(p)
wl_protos_src += wayland_scanner_code.process(xml) wl_protos_src += wayland_scanner_code.process(xml)
wl_protos_headers += wayland_scanner_server.process(xml) wl_protos_headers += wayland_scanner_server.process(xml)
endforeach endforeach
foreach p : client_protocols foreach p : client_protocols
xml = join_paths(p) xml = join_paths(p)
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('wl_protos', wl_protos_src + wl_protos_headers)
wlr_protos = declare_dependency( wlr_protos = declare_dependency(
link_with: lib_wl_protos, link_with: lib_wl_protos,
sources: wl_protos_headers) sources: wl_protos_headers,
)

29
render/meson.build
View File

@ -1,13 +1,16 @@
lib_wlr_render = static_library('wlr_render', files( lib_wlr_render = static_library(
'egl.c', 'wlr_render',
'matrix.c', files(
'gles2/pixel_format.c', 'egl.c',
'gles2/renderer.c', 'matrix.c',
'gles2/shaders.c', 'gles2/pixel_format.c',
'gles2/texture.c', 'gles2/renderer.c',
'gles2/util.c', 'gles2/shaders.c',
'wlr_renderer.c', 'gles2/texture.c',
'wlr_texture.c', 'gles2/util.c',
), 'wlr_renderer.c',
include_directories: wlr_inc, 'wlr_texture.c',
dependencies: [glesv2, egl]) ),
include_directories: wlr_inc,
dependencies: [glesv2, egl],
)

47
types/meson.build
View File

@ -1,22 +1,25 @@
lib_wlr_types = static_library('wlr_types', files( lib_wlr_types = static_library(
'wlr_data_device_manager.c', 'wlr_types',
'wlr_data_source.c', files(
'wlr_input_device.c', 'wlr_data_device_manager.c',
'wlr_keyboard.c', 'wlr_data_source.c',
'wlr_output.c', 'wlr_input_device.c',
'wlr_output_layout.c', 'wlr_keyboard.c',
'wlr_pointer.c', 'wlr_output.c',
'wlr_cursor.c', 'wlr_output_layout.c',
'wlr_region.c', 'wlr_pointer.c',
'wlr_seat.c', 'wlr_cursor.c',
'wlr_surface.c', 'wlr_region.c',
'wlr_tablet_pad.c', 'wlr_seat.c',
'wlr_tablet_tool.c', 'wlr_surface.c',
'wlr_touch.c', 'wlr_tablet_pad.c',
'wlr_xdg_shell_v6.c', 'wlr_tablet_tool.c',
'wlr_wl_shell.c', 'wlr_touch.c',
'wlr_compositor.c', 'wlr_xdg_shell_v6.c',
'wlr_box.c', 'wlr_wl_shell.c',
), 'wlr_compositor.c',
include_directories: wlr_inc, 'wlr_box.c',
dependencies: [wayland_server, pixman, wlr_protos]) ),
include_directories: wlr_inc,
dependencies: [wayland_server, pixman, wlr_protos],
)

13
util/meson.build
View File

@ -1,5 +1,8 @@
lib_wlr_util = static_library('wlr_util', files( lib_wlr_util = static_library(
'list.c', 'wlr_util',
'log.c', files(
), 'list.c',
include_directories: wlr_inc) 'log.c',
),
include_directories: wlr_inc,
)

13
xcursor/meson.build
View File

@ -1,5 +1,8 @@
lib_wlr_xcursor = static_library('wlr_xcursor', files( lib_wlr_xcursor = static_library(
'xcursor.c', 'wlr_xcursor',
'wlr_xcursor.c', files(
), 'xcursor.c',
include_directories: wlr_inc) 'wlr_xcursor.c',
),
include_directories: wlr_inc,
)

17
xwayland/meson.build
View File

@ -1,7 +1,10 @@
lib_wlr_xwayland = static_library('wlr_xwayland', files( lib_wlr_xwayland = static_library(
'sockets.c', 'wlr_xwayland',
'xwayland.c', files(
'xwm.c', 'sockets.c',
), 'xwayland.c',
include_directories: wlr_inc, 'xwm.c',
dependencies: [wayland_server, xcb, xcb_composite, pixman]) ),
include_directories: wlr_inc,
dependencies: [wayland_server, xcb, xcb_composite, pixman],
)