Mesa (master): meson: add variable for including include/GL/internal

[Dylan Baker]

Module: Mesa
Branch: master
Commit: aca3b647bedd581c6d0b428f9f5d58a65048f869
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=aca3b647bedd581c6d0b428f9f5d58a65048f869

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Wed Jan  3 12:37:34 2018 -0800

meson: add variable for including include/GL/internal

Signed-off-by: <dylan.c.baker at intel.com>
Acked-by: Eric Engestrom <eric.engestrom at imgtec.com>

---

 include/meson.build       |  1 +
 src/glx/meson.build       | 10 ++--------
 src/glx/tests/meson.build |  4 ++--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/include/meson.build b/include/meson.build
index a2e7ce6580..1cbc68182c 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -21,6 +21,7 @@
 inc_drm_uapi = include_directories('drm-uapi')
 inc_vulkan = include_directories('vulkan')
 inc_d3d9 = include_directories('D3D9')
+inc_gl_internal = include_directories('GL/internal')
 
 if with_gles1
   install_headers(
diff --git a/src/glx/meson.build b/src/glx/meson.build
index 7757eee352..04cd647ee4 100644
--- a/src/glx/meson.build
+++ b/src/glx/meson.build
@@ -138,10 +138,7 @@ endif
 libglx = static_library(
   'glx',
   [files_libglx, glx_generated],
-  include_directories : [
-    inc_common, inc_glapi, inc_loader,
-    include_directories('../../include/GL/internal'),
-  ],
+  include_directories : [inc_common, inc_glapi, inc_loader, inc_gl_internal],
   c_args : [
     c_vis_args, gl_lib_cargs,
     '-DGL_LIB_NAME="lib at 0@.so. at 1@"'.format(gl_lib_name, gl_lib_version.split('.')[0]),
@@ -165,10 +162,7 @@ if with_glx == 'dri'
   libgl = shared_library(
     gl_lib_name,
     dummy_c,  # workaround for bug #2180
-    include_directories : [
-      inc_common, inc_glapi, inc_loader,
-      include_directories('../../include/GL/internal'),
-    ],
+    include_directories : [inc_common, inc_glapi, inc_loader, inc_gl_internal],
     link_with : [libglapi_static, libglapi],
     link_whole : libglx,
     link_args : [ld_args_bsymbolic, ld_args_gc_sections, extra_ld_args_libgl],
diff --git a/src/glx/tests/meson.build b/src/glx/tests/meson.build
index fe0075a693..fd9d4d433b 100644
--- a/src/glx/tests/meson.build
+++ b/src/glx/tests/meson.build
@@ -40,8 +40,8 @@ if with_shared_glapi
       [files_glx_test, glx_indirect_size_h, main_dispatch_h],
       link_with : [libglx, libglapi],
       include_directories : [
-        include_directories('..', '../../../include/GL/internal'),
-        inc_src, inc_include, inc_mesa, inc_mapi,
+        inc_src, inc_include, inc_mesa, inc_mapi, inc_gl_internal,
+        include_directories('..'),
       ],
       dependencies : [dep_libdrm, dep_thread, idep_gtest]
     )