meson: inline `inc_common`

Let's make it clear what includes are being added everywhere, so that
they can be cleaned up.

Signed-off-by: Eric Engestrom <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4360>

8 files changed, 8 insertions, 8 deletions

diff --git a/src/util/tests/fast_idiv_by_const/meson.build b/src/util/tests/fast_idiv_by_const/meson.build
index 00b24678b75..9c8c03d974e 100644
--- a/src/util/tests/fast_idiv_by_const/meson.build
+++ b/src/util/tests/fast_idiv_by_const/meson.build
@@ -24,7 +24,7 @@ test(
     'fast_idiv_by_const_test',
     'fast_idiv_by_const_test.cpp',
     dependencies : [idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   ),
   suite : ['util'],
   timeout: 60,
diff --git a/src/util/tests/fast_urem_by_const/meson.build b/src/util/tests/fast_urem_by_const/meson.build
index a16407d5ea6..07930974551 100644
--- a/src/util/tests/fast_urem_by_const/meson.build
+++ b/src/util/tests/fast_urem_by_const/meson.build
@@ -25,7 +25,7 @@ test(
     'fast_urem_by_const_test',
     'fast_urem_by_const_test.cpp',
     dependencies : [idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   ),
   suite : ['util'],
 )
diff --git a/src/util/tests/format/meson.build b/src/util/tests/format/meson.build
index 6f4b91cf810..761ce49abe7 100644
--- a/src/util/tests/format/meson.build
+++ b/src/util/tests/format/meson.build
@@ -3,7 +3,7 @@ foreach t : ['srgb', 'u_format_test', 'u_format_compatible_test']
     executable(
       t,
       '@[email protected]'.format(t),
-      include_directories : inc_common,
+      include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
       dependencies : idep_mesautil,
     ),
     suite : 'format',
diff --git a/src/util/tests/set/meson.build b/src/util/tests/set/meson.build
index 9d0d311ba5e..e9b00629b44 100644
--- a/src/util/tests/set/meson.build
+++ b/src/util/tests/set/meson.build
@@ -24,7 +24,7 @@ test(
     'set_test',
     'set_test.cpp',
     dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   ),
   suite : ['util'],
 )
diff --git a/src/util/tests/sparse_array/meson.build b/src/util/tests/sparse_array/meson.build
index 7c86efea29d..9afb49301fb 100644
--- a/src/util/tests/sparse_array/meson.build
+++ b/src/util/tests/sparse_array/meson.build
@@ -24,7 +24,7 @@ test(
     'multi_threaded',
     'multi_threaded.c',
     dependencies : [idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   ),
   suite : ['util'],
   timeout: 60,
diff --git a/src/util/tests/string_buffer/meson.build b/src/util/tests/string_buffer/meson.build
index b3eb2714a36..acb6abca475 100644
--- a/src/util/tests/string_buffer/meson.build
+++ b/src/util/tests/string_buffer/meson.build
@@ -25,7 +25,7 @@ test(
     'string_buffer_test.cpp',
     cpp_args : [cpp_msvc_compat_args],
     dependencies : [idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   ),
   suite : ['util'],
 )
diff --git a/src/util/tests/timespec/meson.build b/src/util/tests/timespec/meson.build
index c685db5fd99..2fc737a7db4 100644
--- a/src/util/tests/timespec/meson.build
+++ b/src/util/tests/timespec/meson.build
@@ -24,7 +24,7 @@ test(
     'timespec_test',
     'timespec_test.cpp',
     dependencies : [dep_thread, dep_dl, idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   ),
   suite : ['util'],
 )
diff --git a/src/util/tests/vector/meson.build b/src/util/tests/vector/meson.build
index d05abc6338b..40ad93995a4 100644
--- a/src/util/tests/vector/meson.build
+++ b/src/util/tests/vector/meson.build
@@ -24,7 +24,7 @@ test(
     'vector_test',
     'vector_test.cpp',
     dependencies : [idep_gtest, idep_mesautil],
-    include_directories : inc_common,
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   ),
   suite : ['util'],
 )