Module: Mesa
Branch: master
Commit: d16af7355900703514d95411b222e6e028252d66
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d16af7355900703514d95411b222e6e028252d66
Author: Eric Engestrom <eric.engest...@imgtec.com>
Date: Tue Nov 21 15:07:11 2017 +0000
meson: reorder subdirs to avoid directly including more than one level
Signed-off-by: Eric Engestrom <eric.engest...@imgtec.com>
Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
---
src/mapi/glapi/meson.build | 2 ++
src/mapi/meson.build | 2 +-
src/meson.build | 1 -
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build
index f201264478..14ffa68ad0 100644
--- a/src/mapi/glapi/meson.build
+++ b/src/mapi/glapi/meson.build
@@ -18,6 +18,8 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
+subdir('gen')
+
inc_glapi = include_directories('.')
static_glapi_files = []
diff --git a/src/mapi/meson.build b/src/mapi/meson.build
index ce94ee4b27..afdde3dd8c 100644
--- a/src/mapi/meson.build
+++ b/src/mapi/meson.build
@@ -25,10 +25,10 @@ files_mapi_util = files(
'u_execmem.h',
)
+subdir('glapi')
if with_shared_glapi
subdir('shared-glapi')
endif
-subdir('glapi')
if with_gles1
subdir('es1api')
endif
diff --git a/src/meson.build b/src/meson.build
index 00bbaa8989..db36866df6 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -45,7 +45,6 @@ sha1_h = custom_target(
subdir('gtest')
subdir('util')
-subdir('mapi/glapi/gen')
subdir('mapi')
# TODO: opengl
subdir('compiler')
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
