summaryrefslogtreecommitdiffstats
path: root/src/broadcom
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2019-07-22 14:50:15 +0100
committerEric Engestrom <[email protected]>2019-08-03 00:08:37 +0000
commitd2d85b950d78c553b2694cda9ef0cc7bf9a0f737 (patch)
treeafdd28e30b66064b8b540a6e9d6d0ecbe27a6678 /src/broadcom
parent8ddb38209d51c53d6e5792b04b97814dfce9bce6 (diff)
meson: replace libmesa_util with idep_mesautil
This automates the include_directories and dependencies tracking so that all users of libmesa_util don't need to add them manually. Next commit will remove the ones that were only added for that reason. Signed-off-by: Eric Engestrom <[email protected]> Acked-by: Eric Anholt <[email protected]> Tested-by: Vinson Lee <[email protected]>
Diffstat (limited to 'src/broadcom')
-rw-r--r--src/broadcom/drm-shim/meson.build4
-rw-r--r--src/broadcom/qpu/meson.build3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/broadcom/drm-shim/meson.build b/src/broadcom/drm-shim/meson.build
index 2c2e4c5eb2e..4fcc594add6 100644
--- a/src/broadcom/drm-shim/meson.build
+++ b/src/broadcom/drm-shim/meson.build
@@ -53,8 +53,8 @@ if dep_v3dv3.found()
'v3d.c',
'../../gallium/drivers/v3d/v3d_simulator_wrapper.cpp',
],
- dependencies: [dep_dl, dep_drm_shim, dep_v3dv3],
- link_with: [libmesa_util, per_version_libs],
+ dependencies: [idep_mesautil, dep_dl, dep_drm_shim, dep_v3dv3],
+ link_with: per_version_libs,
include_directories : [inc_common, inc_broadcom, inc_gallium_v3d],
c_args : [c_vis_args, no_override_init_args, '-std=gnu99', v3dv3_c_args],
cpp_args : [v3dv3_c_args]
diff --git a/src/broadcom/qpu/meson.build b/src/broadcom/qpu/meson.build
index 279b09cb95a..c9cf7b9e92b 100644
--- a/src/broadcom/qpu/meson.build
+++ b/src/broadcom/qpu/meson.build
@@ -39,7 +39,8 @@ test(
'qpu_disasm',
executable(
'qpu_disasm', 'tests/qpu_disasm.c',
- link_with: [libbroadcom_qpu, libmesa_util],
+ link_with: libbroadcom_qpu,
+ dependencies : idep_mesautil,
include_directories: inc_common
),
suite : ['broadcom'],