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>

7 files changed, 9 insertions, 9 deletions

diff --git a/src/mesa/drivers/dri/common/meson.build b/src/mesa/drivers/dri/common/meson.build
index 50e652de125..2021344c638 100644
--- a/src/mesa/drivers/dri/common/meson.build
+++ b/src/mesa/drivers/dri/common/meson.build
@@ -23,7 +23,7 @@ inc_dri_common = include_directories('.')
 libdricommon = static_library(
   'dricommon',
   files('utils.c', 'utils.h', 'dri_util.c', 'dri_util.h'),
-  include_directories : [inc_common, inc_util],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_util],
   c_args : c_vis_args,
   dependencies : [dep_libdrm, idep_xmlconfig_headers],
   build_by_default : false,
@@ -32,7 +32,7 @@ libdricommon = static_library(
 libmegadriver_stub = static_library(
   'megadriver_stub',
   'megadriver_stub.c',
-  include_directories : inc_common,
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
   c_args : c_vis_args,
   dependencies : dep_libdrm,
   build_by_default : false,
diff --git a/src/mesa/drivers/dri/i915/meson.build b/src/mesa/drivers/dri/i915/meson.build
index 58eb698ac0f..1c3f88c01f2 100644
--- a/src/mesa/drivers/dri/i915/meson.build
+++ b/src/mesa/drivers/dri/i915/meson.build
@@ -87,7 +87,7 @@ files_i915 = files(
 libi915 = static_library(
   'i915',
   files_i915,
-  include_directories : [inc_common, inc_dri_common, inc_util],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common, inc_util],
   c_args : [c_vis_args, no_override_init_args],
   cpp_args : [cpp_vis_args],
   dependencies : [dep_libdrm, dep_libdrm_intel, idep_xmlconfig_headers],
diff --git a/src/mesa/drivers/dri/i965/meson.build b/src/mesa/drivers/dri/i965/meson.build
index a0c497ba3ba..cf94548800b 100644
--- a/src/mesa/drivers/dri/i965/meson.build
+++ b/src/mesa/drivers/dri/i965/meson.build
@@ -136,7 +136,7 @@ foreach v : ['40', '45', '50', '60', '70', '75', '80', '90', '100', '110']
     'i965_gen@0@'.format(v),
     ['genX_blorp_exec.c', 'genX_boilerplate.h', 'genX_pipe_control.c',
      'genX_state_upload.c', gen_xml_pack],
-    include_directories : [inc_common, inc_intel, inc_dri_common],
+    include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_dri_common],
     c_args : [
       c_vis_args, no_override_init_args, c_sse2_args,
       '-DGEN_VERSIONx10=@0@'.format(v),
@@ -150,7 +150,7 @@ libi965 = static_library(
   'i965',
   [files_i965, ir_expression_operation_h],
   include_directories : [
-    inc_common, inc_intel, inc_dri_common, inc_include,
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_intel, inc_dri_common,
   ],
   c_args : [c_vis_args, no_override_init_args, c_sse2_args],
   cpp_args : [cpp_vis_args, c_sse2_args],
diff --git a/src/mesa/drivers/dri/nouveau/meson.build b/src/mesa/drivers/dri/nouveau/meson.build
index 369493dfee1..39c580d159e 100644
--- a/src/mesa/drivers/dri/nouveau/meson.build
+++ b/src/mesa/drivers/dri/nouveau/meson.build
@@ -82,7 +82,7 @@ files_nouveau_vieux = files(
 libnouveau_vieux = static_library(
   'nouveau_vieux',
   files_nouveau_vieux,
-  include_directories : [inc_common, inc_dri_common, inc_util],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common, inc_util],
   c_args : [c_vis_args],
   cpp_args : [cpp_vis_args],
   dependencies : [dep_libdrm, dep_libdrm_nouveau, idep_xmlconfig_headers],
diff --git a/src/mesa/drivers/dri/r200/meson.build b/src/mesa/drivers/dri/r200/meson.build
index 7026129eb32..9e3bea3afd2 100644
--- a/src/mesa/drivers/dri/r200/meson.build
+++ b/src/mesa/drivers/dri/r200/meson.build
@@ -80,7 +80,7 @@ libr200 = static_library(
   'r200',
   files_r200,
   include_directories : [
-    inc_common, inc_dri_common, inc_util, include_directories('server'),
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common, inc_util, include_directories('server'),
   ],
   c_args : [c_vis_args, '-DRADEON_R200'],
   cpp_args : [cpp_vis_args],
diff --git a/src/mesa/drivers/dri/radeon/meson.build b/src/mesa/drivers/dri/radeon/meson.build
index e79a5d00dbd..4e6a375728c 100644
--- a/src/mesa/drivers/dri/radeon/meson.build
+++ b/src/mesa/drivers/dri/radeon/meson.build
@@ -76,7 +76,7 @@ libr100 = static_library(
   'r100',
   files_r100,
   include_directories : [
-    inc_common, inc_dri_common, inc_util, include_directories('server'),
+    inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common, inc_util, include_directories('server'),
   ],
   c_args : [c_vis_args, '-DRADEON_R100'],
   cpp_args : [cpp_vis_args],
diff --git a/src/mesa/drivers/dri/swrast/meson.build b/src/mesa/drivers/dri/swrast/meson.build
index 35b30588ca7..e27606bae6e 100644
--- a/src/mesa/drivers/dri/swrast/meson.build
+++ b/src/mesa/drivers/dri/swrast/meson.build
@@ -22,6 +22,6 @@ libswrast_dri = static_library(
   'swrast_dri',
   files('swrast.c', 'swrast_priv.h'),
   c_args : [c_vis_args],
-  include_directories : [inc_common, inc_dri_common],
+  include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_dri_common],
   dependencies : dep_libdrm,
 )