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>

diff --git a/src/egl/meson.build b/src/egl/meson.build
index 36cd33ac08b24134a61f902a32370326bb9ba27e..6537e4bdee61a49e5ae855c18584d472567553ee 100644 (file)
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -18,10 +18,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 

+inc_egl = include_directories('.', 'main')
+inc_egl_dri2 = include_directories('drivers/dri2')
+

 c_args_for_egl = []
 link_for_egl = []
 deps_for_egl = []
 c_args_for_egl = []
 link_for_egl = []
 deps_for_egl = []

-incs_for_egl = [inc_include, inc_src, include_directories('main')]
+incs_for_egl = [inc_include, inc_src, inc_egl]

 
 files_egl = files(
   'main/eglapi.c',
 
 files_egl = files(
   'main/eglapi.c',

diff --git a/src/gallium/state_trackers/dri/meson.build b/src/gallium/state_trackers/dri/meson.build
index b99314ebf614d43990b894d6212ef2e5829b9804..dfc37fcd81c54b5dd10cec02905a2d2183c221f4 100644 (file)
--- 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.
 
 # 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',
 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 b0c71a895ff5d12e2bd2e94e8b3b0fb1413e42bf..dd803f679fa6aa5d6519bfe3535299a51aa389a0 100644 (file)
--- 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,
 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
 ]
 dep_st_omx = [dep_st_omx, dep_omx_other, dep_libdrm]
 endif

diff --git a/src/gbm/meson.build b/src/gbm/meson.build
index 13fa3a1f84c36b1af1a07612af2bb22e54194e0d..7a60868783ca71aeaea216ab47a6be3b9488ecd1 100644 (file)
--- a/src/gbm/meson.build
+++ b/src/gbm/meson.build
@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 

-inc_gbm = include_directories('.', 'backends/dri')
+inc_gbm = include_directories('.', 'main', 'backends/dri')

 
 files_gbm = files(
   'main/backend.c',
 
 files_gbm = files(
   'main/backend.c',