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>

5 files changed, 9 insertions, 9 deletions

diff --git a/src/broadcom/cle/meson.build b/src/broadcom/cle/meson.build
index a2f47625a50..01167672f9f 100644
--- a/src/broadcom/cle/meson.build
+++ b/src/broadcom/cle/meson.build
@@ -56,7 +56,7 @@ v3d_xml_h = custom_target(
 libbroadcom_cle = static_library(
   ['broadcom_cle', v3d_xml_h],
   'v3d_decoder.c',
-  include_directories : [inc_common, inc_broadcom],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
   c_args : [c_vis_args, no_override_init_args],
   dependencies : [dep_libdrm, dep_valgrind, dep_expat, dep_zlib],
   build_by_default : false,
diff --git a/src/broadcom/compiler/meson.build b/src/broadcom/compiler/meson.build
index d7af999c321..c3e1994aee5 100644
--- a/src/broadcom/compiler/meson.build
+++ b/src/broadcom/compiler/meson.build
@@ -45,7 +45,7 @@ libbroadcom_compiler_files = files(
 libbroadcom_compiler = static_library(
   ['broadcom_compiler', v3d_xml_pack],
   libbroadcom_compiler_files,
-  include_directories : [inc_common, inc_broadcom],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
   c_args : [c_vis_args, no_override_init_args],
   dependencies : [dep_libdrm, dep_valgrind, idep_nir_headers],
   build_by_default : false,
diff --git a/src/broadcom/drm-shim/meson.build b/src/broadcom/drm-shim/meson.build
index 4fcc594add6..d053d2c5b59 100644
--- a/src/broadcom/drm-shim/meson.build
+++ b/src/broadcom/drm-shim/meson.build
@@ -21,7 +21,7 @@
 libv3d_noop_drm_shim = shared_library(
   ['v3d_noop_drm_shim'],
   'v3d_noop.c',
-  include_directories: inc_common,
+  include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   dependencies: dep_drm_shim,
   c_args : c_vis_args,
   install : true,
@@ -41,7 +41,7 @@ if dep_v3dv3.found()
                             'v3dx.c',
                             v3d_xml_pack
         ],
-        include_directories : [inc_common, inc_broadcom, inc_src, inc_gallium_v3d],
+        include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom, inc_gallium_v3d],
         c_args : [c_vis_args, no_override_init_args, '-DV3D_VERSION=' + ver, v3dv3_c_args],
         dependencies: [dep_valgrind, dep_thread, dep_v3dv3],
     )
@@ -55,7 +55,7 @@ if dep_v3dv3.found()
     ],
     dependencies: [idep_mesautil, dep_dl, dep_drm_shim, dep_v3dv3],
     link_with: per_version_libs,
-    include_directories : [inc_common, inc_broadcom, inc_gallium_v3d],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, 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/meson.build b/src/broadcom/meson.build
index 57f0d889b25..3abbc5431d7 100644
--- a/src/broadcom/meson.build
+++ b/src/broadcom/meson.build
@@ -42,7 +42,7 @@ foreach ver : v3d_versions
       files('clif/v3dx_dump.c'),
       v3d_xml_pack
     ],
-    include_directories : [inc_common, inc_broadcom, inc_src],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
     c_args : [c_vis_args, no_override_init_args, '-DV3D_VERSION=' + ver],
     dependencies: [dep_valgrind, dep_thread],
   )
@@ -54,7 +54,7 @@ libbroadcom_v3d = static_library(
     files('common/v3d_debug.c', 'common/v3d_device_info.c', 'clif/clif_dump.c'),
     v3d_xml_pack,
   ],
-  include_directories : [inc_common, inc_broadcom, inc_src],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
   c_args : [c_vis_args, no_override_init_args],
   link_whole : v3d_libs + per_version_libs,
   build_by_default : false,
diff --git a/src/broadcom/qpu/meson.build b/src/broadcom/qpu/meson.build
index c9cf7b9e92b..08162037a32 100644
--- a/src/broadcom/qpu/meson.build
+++ b/src/broadcom/qpu/meson.build
@@ -27,7 +27,7 @@ libbroadcom_qpu_files = files(
 libbroadcom_qpu = static_library(
   ['broadcom_qpu', v3d_xml_pack],
   libbroadcom_qpu_files,
-  include_directories : [inc_common, inc_broadcom],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_broadcom],
   c_args : [c_vis_args, no_override_init_args],
   dependencies : [dep_libdrm, dep_valgrind],
   build_by_default : false,
@@ -41,7 +41,7 @@ test(
     'qpu_disasm', 'tests/qpu_disasm.c',
     link_with: libbroadcom_qpu,
     dependencies : idep_mesautil,
-    include_directories: inc_common
+    include_directories: [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux]
   ),
   suite : ['broadcom'],
 )