diff options
| author | Dylan Baker <[email protected]> | 2018-03-06 10:36:42 -0800 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-03-07 13:30:53 -0800 |
| commit | 6f628951afa342c1da5b770ab1cc73b50fab1a10 (patch) | |
| tree | 910c633f2bcc468f92efa20301dec82c64a43ad3 | |
| parent | 34e852d5b50772199797ea839fc8d6b3805633ff (diff) | |
meson: Use include directory variables instead of traversing
Signed-off-by: Dylan Baker <[email protected]>
Reviewed-by: Jon Turney <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
Tested-by: Julien Isorce <[email protected]>
Tested-by: Karol Herbst <[email protected]>
| -rw-r--r-- | src/egl/meson.build | 5 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/meson.build | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/omx/meson.build | 12 | ||||
| -rw-r--r-- | src/gbm/meson.build | 2 |
4 files changed, 12 insertions, 9 deletions
diff --git a/src/egl/meson.build b/src/egl/meson.build index 36cd33ac08b..6537e4bdee6 100644 --- 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. +inc_egl = include_directories('.', 'main') +inc_egl_dri2 = include_directories('drivers/dri2') + 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', diff --git a/src/gallium/state_trackers/dri/meson.build b/src/gallium/state_trackers/dri/meson.build index b99314ebf61..dfc37fcd81c 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 b0c71a895ff..dd803f679fa 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 diff --git a/src/gbm/meson.build b/src/gbm/meson.build index 13fa3a1f84c..7a60868783c 100644 --- 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. -inc_gbm = include_directories('.', 'backends/dri') +inc_gbm = include_directories('.', 'main', 'backends/dri') files_gbm = files( 'main/backend.c', |