mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: simplify include_directories

Browse Source 
Define common_inc which includes both public_inc and the project root directory.
The project root directory will allow access to config.h and all the shared/
headers.

Replacing all custom '.', '..', '../..', '../shared' etc. include paths with
common_inc reduces clutter in the target definitions and enforces the common
 #include directive style, as e.g. including shared/ headers without the
subdirectory name no longer works.

Unfortunately this does not prevent one from using private libweston headers
with the usual include pattern for public headers.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen
2019-04-05 17:09:28 +03:00
parent c232f8d934
commit 4f5e360180
21 changed files with 51 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/meson.build
+10 -10
View File
@@ -25,7 +25,7 @@ deps_toytoolkit = [
lib_toytoolkit = static_library(
'toytoolkit',
srcs_toytoolkit,
include_directories: include_directories('..', '../shared'),
include_directories: common_inc,
dependencies: deps_toytoolkit,
install: false,
)
@@ -132,7 +132,7 @@ foreach t : simple_clients
executable(
t_name, t.get('sources'),
include_directories: [ include_directories('..'), public_inc ],
include_directories: common_inc,
dependencies: t_deps,
install: true
)
@@ -146,7 +146,7 @@ if simple_build_all or simple_clients_enabled.contains('im')
input_method_unstable_v1_client_protocol_h,
input_method_unstable_v1_protocol_c,
],
include_directories: include_directories('..'),
include_directories: common_inc,
dependencies: [
dep_libshared,
dep_wayland_client,
@@ -211,7 +211,7 @@ foreach t : tools_list
executable(
'weston-@0@'.format(t.get('name')),
t.get('sources'),
include_directories: [ include_directories('..', '../shared'), public_inc ],
include_directories: common_inc,
dependencies: t.get('deps', []),
install: true
)
@@ -292,7 +292,7 @@ if get_option('demo-clients')
executable(
t_name, t_srcs,
include_directories: include_directories('..', '../shared'),
include_directories: common_inc,
dependencies: t_deps,
install: true
)
@@ -332,7 +332,7 @@ if simple_dmabuf_drm_deps.length() > 0
fullscreen_shell_unstable_v1_protocol_c,
linux_dmabuf_unstable_v1_client_protocol_h,
linux_dmabuf_unstable_v1_protocol_c,
include_directories: [ include_directories('..'), public_inc ],
include_directories: common_inc,
dependencies: [
dep_wayland_client,
dep_libdrm,
@@ -350,7 +350,7 @@ if get_option('shell-desktop')
text_input_unstable_v1_protocol_c,
input_method_unstable_v1_client_protocol_h,
input_method_unstable_v1_protocol_c,
include_directories: include_directories('..'),
include_directories: common_inc,
dependencies: dep_toytoolkit,
install_dir: get_option('libexecdir'),
install: true
@@ -362,7 +362,7 @@ if get_option('shell-desktop')
'screenshot.c',
weston_screenshooter_client_protocol_h,
weston_screenshooter_protocol_c,
include_directories: include_directories('..'),
include_directories: common_inc,
dependencies: dep_toytoolkit,
install_dir: get_option('bindir'),
install: true
@@ -374,7 +374,7 @@ if get_option('shell-desktop')
'desktop-shell.c',
weston_desktop_shell_client_protocol_h,
weston_desktop_shell_protocol_c,
include_directories: include_directories('..'),
include_directories: common_inc,
dependencies: dep_toytoolkit,
install_dir: get_option('libexecdir'),
install: true
@@ -391,7 +391,7 @@ if get_option('shell-ivi')
ivi_hmi_controller_protocol_c,
ivi_application_client_protocol_h,
ivi_application_protocol_c,
include_directories: include_directories('..'),
include_directories: common_inc,
dependencies: dep_toytoolkit,
install: true,
install_dir: get_option('libexecdir')