[Mesa-dev] [PATCH 2/5] meson: move wayland-egl into egl folder

Dylan Baker dylan at pnwbakers.com
Fri Nov 3 00:06:26 UTC 2017


This ensure that it's properly guarded, but also makes the code clearer
by grouping related things together..

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 src/egl/meson.build | 4 ++++
 src/meson.build     | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/egl/meson.build b/src/egl/meson.build
index 67ca8cef921..a84b17baefa 100644
--- a/src/egl/meson.build
+++ b/src/egl/meson.build
@@ -182,6 +182,10 @@ pkg.generate(
   extra_cflags : gl_pkgconfig_c_flags,
 )
 
+if with_platform_wayland
+  subdir('wayland/wayland-egl')
+endif
+
 if with_tests
   if with_glvnd
     # TODO: add glvnd symbol check
diff --git a/src/meson.build b/src/meson.build
index cc8f5953c51..186cf92f47e 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -59,9 +59,6 @@ subdir('intel')
 subdir('mesa')
 subdir('loader')
 subdir('glx')
-if with_platform_wayland
-  subdir('egl/wayland/wayland-egl')
-endif
 if with_gbm
   subdir('gbm')
 endif
-- 
2.15.0



More information about the mesa-dev mailing list