From 6f628951afa342c1da5b770ab1cc73b50fab1a10 Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan@pnwbakers.com>
Date: Tue, 6 Mar 2018 10:36:42 -0800
Subject: meson: Use include directory variables instead of traversing

Signed-off-by: Dylan Baker <dylan.c.baker@intel.com>
Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Tested-by: Julien Isorce <julien.isorce@gmail.com>
Tested-by: Karol Herbst <kherbst@redhat.com>
---
 src/gallium/state_trackers/dri/meson.build |  2 ++
 src/gallium/state_trackers/omx/meson.build | 12 +++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/gallium/state_trackers')

diff --git a/src/gallium/state_trackers/dri/meson.build b/src/gallium/state_trackers/dri/meson.build
index b99314ebf6..dfc37fcd81 100644
--- a/src/gallium/state_trackers/dri/meson.build
+++ b/src/gallium/state_trackers/dri/meson.build
@@ -18,6 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+inc_st_dri = include_directories('.')
+
 files_libdri = files(
   'dri_context.c',
   'dri_context.h',
diff --git a/src/gallium/state_trackers/omx/meson.build b/src/gallium/state_trackers/omx/meson.build
index b0c71a895f..dd803f679f 100644
--- a/src/gallium/state_trackers/omx/meson.build
+++ b/src/gallium/state_trackers/omx/meson.build
@@ -51,13 +51,11 @@ files_omx += files(
 inc_st_omx = [
   inc_st_omx,
   inc_dri_common,
-  include_directories('../../state_trackers/dri'),
-  include_directories('../../../egl/drivers/dri2'),
-  include_directories('../../../egl/main'),
-  include_directories('../../../egl'),
-  include_directories('../../../gbm/backends/dri'),
-  include_directories('../../../gbm/main'),
-  include_directories('../../../loader')
+  inc_loader,
+  inc_gbm,
+  inc_st_dri,
+  inc_egl,
+  inc_egl_dri2,
 ]
 dep_st_omx = [dep_st_omx, dep_omx_other, dep_libdrm]
 endif
-- 
cgit v1.2.3