Mesa (master): meson: Use include directory variables instead of traversing
Dylan Baker
dbaker at kemper.freedesktop.org
Wed Mar 7 21:31:18 UTC 2018
Module: Mesa
Branch: master
Commit: 6f628951afa342c1da5b770ab1cc73b50fab1a10
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6f628951afa342c1da5b770ab1cc73b50fab1a10
Author: Dylan Baker <dylan at pnwbakers.com>
Date: Tue Mar 6 10:36:42 2018 -0800
meson: Use include directory variables instead of traversing
Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
Reviewed-by: Jon Turney <jon.turney at dronecode.org.uk>
Reviewed-by: Eric Engestrom <eric.engestrom at imgtec.com>
Tested-by: Julien Isorce <julien.isorce at gmail.com>
Tested-by: Karol Herbst <kherbst at redhat.com>
---
src/egl/meson.build | 5 ++++-
src/gallium/state_trackers/dri/meson.build | 2 ++
src/gallium/state_trackers/omx/meson.build | 12 +++++-------
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 36cd33ac08..6537e4bdee 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 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
diff --git a/src/gbm/meson.build b/src/gbm/meson.build
index 13fa3a1f84..7a60868783 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',
More information about the mesa-commit
mailing list