meson: reorder subdirs to avoid directly including more than one level

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>

diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build
index f20126447852d91310ca8fe0be388a305621a3ce..14ffa68ad0daa06a32ed2f7541008cd274e5cc7d 100644 (file)
--- 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 ce94ee4b27a956380617907a5a6d1b37bca7fa58..afdde3dd8cc31f96ca977208eff87c345d070d38 100644 (file)
--- 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 00bbaa8989c4cac6ca1d0ba221d98f35e17b7171..db36866df6375addf72aa42d670139d79a71f19d 100644 (file)
--- 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')