[Mesa-dev] [PATCH mesa 1/2] meson: reorder subdirs to avoid directly including more than one level

[Dylan Baker]

for the series:
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

Quoting Eric Engestrom (2017-11-21 07:09:40)
> Signed-off-by: Eric Engestrom <eric.engestrom at imgtec.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 d2d86afd6c1f07e06489..c2295b431404c401bad2 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 ce94ee4b27a956380617..afdde3dd8cc31f96ca97 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 00bbaa8989c4cac6ca1d..db36866df6375addf72a 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')
> -- 
> Cheers,
>   Eric
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20171121/f22f0c62/attachment-0001.sig>