From 5e3297a97d9a2670ca3d020563d636f2a15e50c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daniel@schuermann.dev>
Date: Mon, 14 Jun 2021 12:58:24 +0200
Subject: [PATCH] aco/meson: remove unnecessary dependencies

Also moves idep_vulkan_util_headers to /tests/meson.build

Reviewed-by: Tony Wasserka <tony.wasserka@gmx.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11271>
---
 src/amd/compiler/meson.build       | 16 +++-------------
 src/amd/compiler/tests/meson.build |  2 +-
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/amd/compiler/meson.build b/src/amd/compiler/meson.build
index ae545ec0fc7..b7850de407d 100644
--- a/src/amd/compiler/meson.build
+++ b/src/amd/compiler/meson.build
@@ -47,12 +47,6 @@ aco_builder_h = custom_target(
   depend_files : aco_depends,
 )
 
-# Headers-only dependency
-idep_aco_headers = declare_dependency(
-  sources : [aco_opcodes_h],
-  include_directories : include_directories('.'),
-)
-
 libaco_files = files(
   'aco_dead_code_analysis.cpp',
   'aco_dominance.cpp',
@@ -94,14 +88,10 @@ _libaco = static_library(
   'aco',
   [libaco_files, aco_opcodes_c, aco_opcodes_h, aco_builder_h],
   include_directories : [
-   inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_compiler, inc_amd, inc_amd_common, inc_amd_common_llvm,
-  ],
-  link_with : [
-    libamd_common
+   inc_include, inc_src, inc_gallium, inc_compiler, inc_amd, inc_amd_common,
   ],
   dependencies : [
-    dep_llvm, dep_thread, dep_elf, dep_libdrm_amdgpu, dep_valgrind,
-    idep_nir_headers, idep_amdgfxregs_h, idep_vulkan_util_headers,
+    dep_llvm, dep_thread, dep_valgrind, idep_nir_headers, idep_amdgfxregs_h, idep_mesautil,
   ],
   gnu_symbol_visibility : 'hidden',
   build_by_default : true,
@@ -110,6 +100,6 @@ _libaco = static_library(
 
 # Also link with aco
 idep_aco = declare_dependency(
-  dependencies : idep_aco_headers,
+  include_directories : include_directories('.'),
   link_with : _libaco,
 )
diff --git a/src/amd/compiler/tests/meson.build b/src/amd/compiler/tests/meson.build
index a96548056bd..222262be32c 100644
--- a/src/amd/compiler/tests/meson.build
+++ b/src/amd/compiler/tests/meson.build
@@ -61,7 +61,7 @@ test(
       libamd_common, libamd_common_llvm, libvulkan_radeon,
     ],
     dependencies : [
-      dep_llvm, dep_thread, idep_aco, idep_nir, idep_mesautil
+      dep_llvm, dep_thread, idep_aco, idep_nir, idep_mesautil, idep_vulkan_util_headers,
     ],
     gnu_symbol_visibility : 'hidden',
     build_by_default : true,