Commit d2d85b95 authored by Eric Engestrom's avatar Eric Engestrom Committed by Eric Engestrom

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's avatarEric Engestrom <eric.engestrom@intel.com>
Acked-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
Tested-by: Vinson Lee's avatarVinson Lee <vlee@freedesktop.org>
parent 8ddb3820
......@@ -153,12 +153,12 @@ libvulkan_radeon = shared_library(
],
link_with : [
libamd_common, libamdgpu_addrlib, libvulkan_wsi,
libmesa_util, libxmlconfig
libxmlconfig
],
dependencies : [
dep_llvm, dep_libdrm_amdgpu, dep_thread, dep_elf, dep_dl, dep_m,
dep_valgrind, radv_deps,
idep_nir, idep_vulkan_util, idep_amdgfxregs_h,
idep_mesautil, idep_nir, idep_vulkan_util, idep_amdgfxregs_h,
],
c_args : [c_vis_args, no_override_init_args, radv_flags],
cpp_args : [cpp_vis_args, radv_flags],
......
......@@ -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]
......
......@@ -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'],
......
......@@ -38,7 +38,7 @@ glcpp_lex = custom_target(
libglcpp = static_library(
'glcpp',
[glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')],
link_with : libmesa_util,
dependencies : idep_mesautil,
include_directories : [inc_common],
c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
......
......@@ -240,8 +240,8 @@ libglsl_standalone = static_library(
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
include_directories : [inc_common],
link_with : [libglsl, libglsl_util, libmesa_util],
dependencies : [dep_thread],
link_with : [libglsl, libglsl_util],
dependencies : [dep_thread, idep_mesautil],
build_by_default : false,
)
......
......@@ -63,9 +63,8 @@ subdir('nir')
spirv2nir = executable(
'spirv2nir',
files('spirv/spirv2nir.c'),
dependencies : [dep_m, dep_thread, idep_nir],
dependencies : [dep_m, dep_thread, idep_nir, idep_mesautil],
include_directories : [inc_common, inc_nir, include_directories('spirv')],
link_with : libmesa_util,
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
build_by_default : with_tools.contains('nir'),
install : with_tools.contains('nir'),
......
......@@ -267,8 +267,7 @@ if with_tests
files('tests/control_flow_tests.cpp'),
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
include_directories : [inc_common],
dependencies : [dep_thread, idep_gtest, idep_nir],
link_with : libmesa_util,
dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
),
suite : ['compiler', 'nir'],
)
......@@ -280,8 +279,7 @@ if with_tests
files('tests/vars_tests.cpp'),
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
include_directories : [inc_common],
dependencies : [dep_thread, idep_gtest, idep_nir],
link_with : libmesa_util,
dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
),
suite : ['compiler', 'nir'],
)
......@@ -301,8 +299,7 @@ if with_tests
files('tests/negative_equal_tests.cpp'),
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
include_directories : [inc_common],
dependencies : [dep_thread, idep_gtest, idep_nir],
link_with : libmesa_util,
dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
)
)
......@@ -313,8 +310,7 @@ if with_tests
files('tests/comparison_pre_tests.cpp'),
c_args : [c_vis_args, c_msvc_compat_args, no_override_init_args],
include_directories : [inc_common],
dependencies : [dep_thread, idep_gtest, idep_nir],
link_with : libmesa_util,
dependencies : [dep_thread, idep_gtest, idep_nir, idep_mesautil],
)
)
endif
......@@ -24,9 +24,8 @@ drm_shim = static_library(
'device.c',
'drm_shim.c',
],
link_with: libmesa_util,
include_directories: [inc_common],
dependencies: [dep_dl],
dependencies: [idep_mesautil, dep_dl],
c_args : [c_vis_args, '-std=gnu99'],
)
dep_drm_shim = declare_dependency(
......
......@@ -165,9 +165,9 @@ libegl = shared_library(
'-D_EGL_NATIVE_PLATFORM=_EGL_PLATFORM_@0@'.format(egl_native_platform.to_upper()),
],
include_directories : incs_for_egl,
link_with : [link_for_egl, libglapi, libmesa_util],
link_with : [link_for_egl, libglapi],
link_args : [ld_args_bsymbolic, ld_args_gc_sections],
dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock, dep_thread],
dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock, dep_thread, idep_mesautil],
install : true,
version : egl_lib_version,
)
......
......@@ -30,8 +30,9 @@ etnaviv_cmd_stream_test = executable(
dependencies : [
dep_libdrm,
dep_valgrind,
idep_mesautil,
],
link_with : [libetnaviv_drm, libmesa_util],
link_with : libetnaviv_drm,
install: false,
)
......@@ -47,7 +48,8 @@ etnaviv_bo_cache_test = executable(
dependencies : [
dep_libdrm,
dep_valgrind,
idep_mesautil,
],
link_with : [libetnaviv_drm, libmesa_util],
link_with : libetnaviv_drm,
install: false,
)
......@@ -95,7 +95,6 @@ libvulkan_freedreno = shared_library(
],
link_with : [
libvulkan_wsi,
libmesa_util,
libfreedreno_drm, # required by ir3_shader_get_variant, which we don't use
libfreedreno_ir3,
],
......@@ -110,6 +109,7 @@ libvulkan_freedreno = shared_library(
idep_nir,
tu_deps,
idep_vulkan_util,
idep_mesautil,
],
c_args : [c_vis_args, no_override_init_args, tu_flags],
link_args : [ld_args_bsymbolic, ld_args_gc_sections],
......
......@@ -106,10 +106,10 @@ etnaviv_compiler = executable(
include_directories : [
inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_etnaviv,
],
link_with : [libmesa_util, libgallium, libetnaviv, libetnaviv_drm],
link_with : [libgallium, libetnaviv, libetnaviv_drm],
build_by_default : with_tools.contains('etnaviv'),
install : with_tools.contains('etnaviv'),
dependencies : dep_libdrm,
dependencies : [idep_mesautil, dep_libdrm],
)
driver_etnaviv = declare_dependency(
......
......@@ -256,6 +256,7 @@ ir3_compiler = executable(
dependencies : [
dep_thread,
idep_nir,
idep_mesautil,
],
link_with : [
libfreedreno,
......@@ -263,7 +264,6 @@ ir3_compiler = executable(
libfreedreno_ir3,
libgallium,
libglsl_standalone,
libmesa_util,
],
build_by_default : with_tools.contains('freedreno'),
install : with_tools.contains('freedreno'),
......
......@@ -99,12 +99,12 @@ lima_compiler = executable(
dependencies : [
dep_thread,
idep_nir,
idep_mesautil,
],
link_with : [
liblima,
libgallium,
libglsl_standalone,
libmesa_util,
libpanfrost_shared,
],
build_by_default : with_tools.contains('lima'),
......
......@@ -116,9 +116,9 @@ if with_tests and with_gallium_softpipe and with_llvm
executable(
t,
['@0@.c'.format(t), 'lp_test_main.c'],
dependencies : [dep_llvm, dep_dl, dep_thread, dep_clock],
dependencies : [dep_llvm, dep_dl, dep_thread, dep_clock, idep_mesautil],
include_directories : [inc_gallium, inc_gallium_aux, inc_include, inc_src],
link_with : [libllvmpipe, libgallium, libmesa_util],
link_with : [libllvmpipe, libgallium],
),
suite : ['llvmpipe'],
)
......
......@@ -223,8 +223,8 @@ nouveau_compiler = executable(
'nouveau_compiler',
'nouveau_compiler.c',
include_directories : [inc_src, inc_include, inc_gallium, inc_gallium_aux],
dependencies : [dep_libdrm, dep_libdrm_nouveau],
link_with : [libnouveau, libgallium, libmesa_util, libnir],
dependencies : [dep_libdrm, dep_libdrm_nouveau, idep_mesautil],
link_with : [libnouveau, libgallium, libnir],
build_by_default : with_tools.contains('nouveau'),
install : with_tools.contains('nouveau'),
)
......
......@@ -156,8 +156,8 @@ if with_tests
inc_src, inc_include, inc_gallium, inc_gallium_aux,
include_directories('compiler'),
],
link_with : [libr300, libgallium, libmesa_util],
dependencies : [dep_m, dep_clock, dep_dl, dep_thread, dep_unwind],
link_with : [libr300, libgallium],
dependencies : [dep_m, dep_clock, dep_dl, dep_thread, dep_unwind, idep_mesautil],
),
suite : ['r300'],
)
......
......@@ -48,12 +48,12 @@ libgallium_nine = shared_library(
link_args : [ld_args_gc_sections, gallium_nine_ld_args],
link_depends : gallium_nine_link_depends,
link_with : [
libgalliumvl_stub, libgallium, libnine_st, libmesa_util,
libgalliumvl_stub, libgallium, libnine_st,
libpipe_loader_static, libws_null, libwsw, libswdri,
libswkmsdri, libnir,
],
dependencies : [
dep_selinux, dep_libdrm, dep_llvm, dep_thread, idep_xmlconfig,
dep_selinux, dep_libdrm, dep_llvm, dep_thread, idep_xmlconfig, idep_mesautil,
driver_swrast, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
driver_i915, driver_svga, driver_iris
],
......
......@@ -28,7 +28,8 @@ libgraw_null = shared_library(
'graw_null',
['graw_null.c'],
include_directories : inc_common,
link_with : [libmesa_util, libgallium],
link_with : libgallium,
dependencies : idep_mesautil,
)
libgraw = libgraw_null
......@@ -23,9 +23,9 @@ libgraw_xlib = shared_library(
['graw_xlib.c'],
include_directories : [inc_common, inc_gallium_drivers, inc_gallium_winsys],
link_with : [
libgraw_util, libmesa_util, libgallium, libws_xlib
libgraw_util, libgallium, libws_xlib
],
dependencies : [dep_thread, driver_swrast],
dependencies : [idep_mesautil, dep_thread, driver_swrast],
version : '1.0',
)
......
......@@ -30,11 +30,11 @@ libswpipe = shared_library(
cpp_args : [cpp_vis_args],
link_args : [ld_args_bsymbolic, ld_args_gc_sections],
link_with : [
libglapi, libswhgl, libsthgl, libmesa_util, libcompiler,
libglapi, libswhgl, libsthgl, libcompiler,
libmesa_gallium, libglsl, libnir, libgallium, libgl
],
dependencies : [
driver_swrast, cpp.find_library('be'), cpp.find_library('translation'),
cpp.find_library('network'), dep_unwind
cpp.find_library('network'), dep_unwind, idep_mesautil,
]
)
......@@ -41,11 +41,11 @@ libomx_gallium = shared_library(
],
link_whole : [libomx_st],
link_with : [
libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
libgalliumvlwinsys, libgalliumvl, libgallium,
libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
],
link_depends : omx_link_depends,
dependencies : [dep_thread, driver_r600, driver_radeonsi, driver_nouveau],
dependencies : [dep_thread, idep_mesautil, driver_r600, driver_radeonsi, driver_nouveau],
install : true,
install_dir : omx_drivers_path,
)
......@@ -39,8 +39,9 @@ libopencl = shared_library(
link_args : [ld_args_gc_sections, opencl_link_args],
link_depends : opencl_link_deps,
link_whole : libclover,
link_with : [libpipe_loader_dynamic, libgallium, libmesa_util],
link_with : [libpipe_loader_dynamic, libgallium],
dependencies : [
idep_mesautil,
dep_thread, dep_clock, dep_dl, dep_unwind, dep_elf, dep_expat,
cpp.find_library('clangCodeGen', dirs : llvm_libdir),
cpp.find_library('clangFrontendTool', dirs : llvm_libdir),
......
......@@ -20,7 +20,7 @@
pipe_loader_link_args = [ld_args_gc_sections]
pipe_loader_link_deps = []
pipe_loader_link_with = [libgallium, libnir, libmesa_util]
pipe_loader_link_with = [libgallium, libnir]
pipe_loader_comp_args = []
pipe_loader_incs = [
inc_include, inc_src, inc_util, inc_gallium, inc_gallium_drivers,
......@@ -69,7 +69,7 @@ foreach x : pipe_loaders
link_depends : pipe_loader_link_deps,
include_directories : pipe_loader_incs,
link_with : [pipe_loader_link_with, x[3]],
dependencies : [dep_thread, x[2]],
dependencies : [idep_mesautil, dep_thread, x[2]],
name_prefix : '',
install : true,
install_dir : pipe_loader_install_dir,
......
......@@ -42,11 +42,12 @@ libva_gallium = shared_library(
],
link_whole : [libva_st],
link_with : [
libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
libgalliumvlwinsys, libgalliumvl, libgallium,
libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
],
dependencies : [
dep_libdrm, dep_thread, driver_r600, driver_radeonsi, driver_nouveau,
idep_mesautil,
],
link_depends : va_link_depends,
# Will be deleted during installation, see install_megadrivers.py
......
......@@ -47,11 +47,12 @@ libvdpau_gallium = shared_library(
],
link_whole : [libvdpau_st],
link_with : [
libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
libgalliumvlwinsys, libgalliumvl, libgallium,
libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
],
dependencies : [
dep_thread, driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
dep_thread, idep_mesautil,
driver_r300, driver_r600, driver_radeonsi, driver_nouveau,
],
link_depends : vdpau_link_depends,
soversion : '@0@.@1@.0'.format(VDPAU_MAJOR, VDPAU_MINOR),
......
......@@ -43,12 +43,13 @@ libxatracker = shared_library(
],
link_whole : [libxa_st],
link_with : [
libgalliumvl_stub, libgallium, libmesa_util, libpipe_loader_static,
libgalliumvl_stub, libgallium, libpipe_loader_static,
libws_null, libwsw, libswdri, libswkmsdri,
],
link_depends : xa_link_depends,
dependencies : [
dep_thread, driver_nouveau, driver_i915, driver_svga, driver_freedreno,
dep_thread, idep_mesautil,
driver_nouveau, driver_i915, driver_svga, driver_freedreno,
],
version : _xa_version,
install : true,
......
......@@ -42,10 +42,10 @@ libxvmc_gallium = shared_library(
],
link_whole : [libxvmc_st],
link_with : [
libgalliumvlwinsys, libgalliumvl, libgallium, libmesa_util,
libgalliumvlwinsys, libgalliumvl, libgallium,
libpipe_loader_static, libws_null, libwsw, libswdri, libswkmsdri,
],
dependencies : [dep_thread, driver_r600, driver_nouveau],
dependencies : [dep_thread, idep_mesautil, driver_r600, driver_nouveau],
link_depends : xvmc_link_depends,
# Will be deleted during installation, see install_megadrivers.py
install : true,
......
......@@ -30,7 +30,7 @@ foreach t : progs
'graw-' + t,
t + '.c',
include_directories : inc_common,
link_with : [libgraw, libgraw_util, libmesa_util, libgallium],
dependencies : [dep_m, dep_thread]
link_with : [libgraw, libgraw_util, libgallium],
dependencies : [dep_m, dep_thread, idep_mesautil],
)
endforeach
......@@ -23,8 +23,8 @@ foreach t : ['compute', 'tri', 'quad-tex']
t,
'@0@.c'.format(t),
include_directories : inc_common,
link_with : [libmesa_util, libgallium, libpipe_loader_dynamic],
dependencies : dep_thread,
link_with : [libgallium, libpipe_loader_dynamic],
dependencies : [idep_mesautil, dep_thread],
install : false,
)
endforeach
......@@ -24,8 +24,8 @@ foreach t : ['pipe_barrier_test', 'u_cache_test', 'u_half_test',
t,
'@0@.c'.format(t),
include_directories : inc_common,
link_with : [libgallium, libmesa_util],
dependencies : [dep_thread],
link_with : libgallium,
dependencies : [idep_mesautil, dep_thread],
install : false,
)
# u_cache_test is slow, and translate_test fails.
......
......@@ -49,8 +49,8 @@ libgbm = shared_library(
include_directories : incs_gbm,
c_args : [c_vis_args, args_gbm],
link_args : [ld_args_gc_sections],
link_with : [libloader, libmesa_util, libxmlconfig],
dependencies : [deps_gbm, dep_dl, dep_thread],
link_with : [libloader, libxmlconfig],
dependencies : [deps_gbm, dep_dl, dep_thread, idep_mesautil],
version : '1.0.0',
install : true,
)
......
......@@ -145,10 +145,10 @@ libglx = static_library(
'-DGL_LIB_NAME="lib@0@.so.@1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]),
],
link_with : [
libloader, libloader_dri3_helper, libmesa_util, libxmlconfig,
libloader, libloader_dri3_helper, libxmlconfig,
extra_libs_libglx,
],
dependencies : [dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd],
dependencies : [idep_mesautil, dep_libdrm, dep_dri2proto, dep_glproto, dep_x11, dep_glvnd],
)
libgl = shared_library(
......
......@@ -58,8 +58,8 @@ if install_intel_gpu_tests
'-DGEN_VERSIONx10=@0@'.format(g[0])
],
include_directories : [inc_common, inc_intel],
link_with : [libintel_dev, libmesa_util],
dependencies : [dep_libdrm, dep_thread, idep_gtest, idep_genxml],
link_with : [libintel_dev],
dependencies : [dep_libdrm, dep_thread, idep_gtest, idep_genxml, idep_mesautil],
install : install_intel_gpu_tests,
)
endforeach
......@@ -85,7 +85,8 @@ if with_tests
'genxml_test',
['tests/genxml_test.c', gentest_pack],
include_directories : [inc_common, inc_intel],
link_with : [libintel_common, libmesa_util],
dependencies : idep_mesautil,
link_with : libintel_common,
c_args : [
'-DGENXML_PATH="@0@"'.format(genxml_path)
],
......
......@@ -155,9 +155,9 @@ if with_tests
'test_@0@.cpp'.format(t),
include_directories : [inc_common, inc_intel],
link_with : [
libintel_compiler, libintel_common, libintel_dev, libmesa_util, libisl,
libintel_compiler, libintel_common, libintel_dev, libisl,
],
dependencies : [dep_thread, dep_dl, idep_gtest, idep_nir],
dependencies : [dep_thread, dep_dl, idep_gtest, idep_nir, idep_mesautil],
),
suite : ['intel'],
)
......
......@@ -126,9 +126,9 @@ if with_tests
executable(
'isl_surf_get_image_offset_test',
'tests/isl_surf_get_image_offset_test.c',
dependencies : dep_m,
dependencies : [dep_m, idep_mesautil],
include_directories : [inc_common, inc_intel],
link_with : [libisl, libintel_dev, libmesa_util],
link_with : [libisl, libintel_dev],
),
suite : ['intel'],
)
......
......@@ -22,7 +22,8 @@ libaub = static_library(
'aub',
files('aub_read.c', 'aub_mem.c'),
include_directories : [inc_common, inc_intel],
link_with : [libintel_common, libintel_dev, libmesa_util],
dependencies : idep_mesautil,
link_with : [libintel_common, libintel_dev],
c_args : [c_vis_args, no_override_init_args],
install : false
)
......@@ -30,9 +31,9 @@ libaub = static_library(
aubinator = executable(
'aubinator',
files('aubinator.c'),
dependencies : [dep_expat, dep_zlib, dep_dl, dep_thread, dep_m],
dependencies : [idep_mesautil, dep_expat, dep_zlib, dep_dl, dep_thread, dep_m],
include_directories : [inc_common, inc_intel],
link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util, libaub],
link_with : [libintel_common, libintel_compiler, libintel_dev, libaub],
c_args : [c_vis_args, no_override_init_args],
install : true
)
......@@ -40,9 +41,9 @@ aubinator = executable(
aubinator_error_decode = executable(
'aubinator_error_decode',
files('aubinator_error_decode.c'),
dependencies : [dep_zlib, dep_thread],
dependencies : [idep_mesautil, dep_zlib, dep_thread],
include_directories : [inc_common, inc_intel],
link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util],
link_with : [libintel_common, libintel_compiler, libintel_dev],
c_args : [c_vis_args, no_override_init_args],
install : true
)
......@@ -50,9 +51,9 @@ aubinator_error_decode = executable(
i965_disasm = executable(
'i965_disasm',
files('i965_disasm.c'),
dependencies : [dep_thread],
dependencies : [idep_mesautil, dep_thread],
include_directories : [inc_common, inc_intel],
link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util],
link_with : [libintel_common, libintel_compiler, libintel_dev],
c_args : [c_vis_args, no_override_init_args],
install : true
)
......@@ -83,9 +84,9 @@ configure_file(
libintel_sanitize_gpu = shared_library(
'intel_sanitize_gpu',
files('intel_sanitize_gpu.c'),
dependencies : [dep_dl, dep_thread],
dependencies : [idep_mesautil, dep_dl, dep_thread],
include_directories : [inc_common, inc_intel, inc_include],
link_with : [libintel_common, libmesa_util],
link_with : libintel_common,
c_args : [c_vis_args, no_override_init_args, c_sse2_args],
install_dir : get_option('libexecdir'),
install : true
......@@ -119,9 +120,9 @@ if with_tools.contains('intel-ui')
aubinator_viewer = executable(
'aubinator_viewer',
files('aubinator_viewer.cpp', 'aubinator_viewer_decoder.cpp'),
dependencies : [dep_zlib, dep_dl, dep_thread, dep_m, libintel_imgui_gtk_dep],
dependencies : [idep_mesautil, dep_zlib, dep_dl, dep_thread, dep_m, libintel_imgui_gtk_dep],
include_directories : [inc_common, inc_intel],
link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util, libaub],
link_with : [libintel_common, libintel_compiler, libintel_dev, libaub],
c_args : [c_vis_args, no_override_init_args],
cpp_args : ['-fpermissive', '-Wno-parentheses', '-Wno-class-memaccess'],
install : true
......@@ -148,9 +149,9 @@ i965_lex_yy_c = custom_target(
i965_asm = executable(
'i965_asm',
['i965_asm.c', i965_gram_tab[0], i965_gram_tab[1], i965_lex_yy_c],
dependencies : [dep_thread],
dependencies : [idep_mesautil, dep_thread],
include_directories : [inc_common, inc_intel],
link_with : [libintel_common, libintel_compiler, libintel_dev, libmesa_util],
link_with : [libintel_common, libintel_compiler, libintel_dev],
c_args : [c_vis_args, no_override_init_args],
install : true
)
......
......@@ -194,10 +194,11 @@ libvulkan_intel = shared_library(
link_whole : [libanv_common, libanv_gen_libs],
link_with : [
libintel_compiler, libintel_common, libintel_dev, libisl, libblorp,
libvulkan_wsi, libmesa_util,
libvulkan_wsi,
],
dependencies : [
dep_thread, dep_dl, dep_m, anv_deps, idep_nir, idep_genxml, idep_vulkan_util
dep_thread, dep_dl, dep_m, anv_deps,
idep_nir, idep_genxml, idep_vulkan_util, idep_mesautil,
],
c_args : anv_flags,
link_args : ['-Wl,--build-id=sha1', ld_args_bsymbolic, ld_args_gc_sections],
......@@ -214,10 +215,11 @@ if with_tests
link_whole : libanv_common,
link_with : [
libanv_gen_libs, libintel_compiler, libintel_common, libintel_dev,
libisl, libblorp, libvulkan_wsi, libmesa_util,
libisl, libblorp, libvulkan_wsi,
],
dependencies : [
dep_thread, dep_dl, dep_m, anv_deps, idep_nir, idep_vulkan_util
dep_thread, dep_dl, dep_m, anv_deps,
idep_nir, idep_vulkan_util, idep_mesautil,
],
c_args : anv_flags,
)
......
......@@ -59,11 +59,12 @@ if _dri_drivers != []
[],
link_whole : _dri_drivers,
link_with : [
libmegadriver_stub, libdricommon, libglapi, libmesa_util,
libmegadriver_stub, libdricommon, libglapi,
libmesa_classic,
],
dependencies : [
dep_selinux, dep_libdrm, dep_m, dep_thread, dep_dl, idep_nir, idep_xmlconfig,
dep_selinux, dep_libdrm, dep_m, dep_thread, dep_dl,
idep_nir, idep_xmlconfig, idep_mesautil,
],
link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections],
# Will be deleted during installation, see install_megadrivers.py
......
......@@ -32,8 +32,8 @@ libgl = shared_library(
include_directories : [
inc_include, inc_src, inc_mesa, inc_mapi, inc_gallium, inc_gallium_aux
],
link_with : [libmesa_classic, libglapi_static, libmesa_util, gl_link_with],
dependencies : [dep_x11, dep_xext, dep_xcb, dep_thread],
link_with : [libmesa_classic, libglapi_static, gl_link_with],
dependencies : [idep_mesautil, dep_x11, dep_xext, dep_xcb, dep_thread],
version : '1.6.0',
install : true,
)
......@@ -33,9 +33,8 @@ test(
include_directories : inc_common,
link_with : [
libmesa_st_test_common, libmesa_gallium, libglapi, libgallium,
libmesa_util,
],