Module: Mesa Branch: master Commit: f9cb2370f3404501c2b594ac116bfb6bfe878e87 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9cb2370f3404501c2b594ac116bfb6bfe878e87
Author: Eric Engestrom <[email protected]> Date: Tue Nov 21 15:07:50 2017 +0000 meson: add variable for mapi_abi.py instead of going back up the tree Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Dylan Baker <[email protected]> --- src/mapi/es1api/meson.build | 2 +- src/mapi/es2api/meson.build | 2 +- src/mapi/glapi/gen/meson.build | 2 +- src/mapi/meson.build | 2 ++ src/mapi/shared-glapi/meson.build | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build index e8b9066a5f..36adde4c48 100644 --- a/src/mapi/es1api/meson.build +++ b/src/mapi/es1api/meson.build @@ -20,7 +20,7 @@ es1_glapi_mapi_tmp_h = custom_target( 'es1_glapi_mapi_tmp.h', - input : ['../mapi_abi.py', gl_and_es_api_files], + input : [mapi_abi_py, gl_and_es_api_files], output : 'glapi_mapi_tmp.h', command : [prog_python2, '@INPUT0@', '--printer', 'es1api', '@INPUT1@'], depend_files : api_xml_files, diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build index 7e868d77b3..be5b8ab204 100644 --- a/src/mapi/es2api/meson.build +++ b/src/mapi/es2api/meson.build @@ -20,7 +20,7 @@ es2_glapi_mapi_tmp_h = custom_target( 'es2_glapi_mapi_tmp.h', - input : ['../mapi_abi.py', gl_and_es_api_files], + input : [mapi_abi_py, gl_and_es_api_files], output : 'glapi_mapi_tmp.h', command : [prog_python2, '@INPUT0@', '--printer', 'es2api', '@INPUT1@'], depend_files : api_xml_files, diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build index 69ef57bc14..599f094e99 100644 --- a/src/mapi/glapi/gen/meson.build +++ b/src/mapi/glapi/gen/meson.build @@ -146,7 +146,7 @@ glx_gen_depends = files( glapi_mapi_tmp_h = custom_target( 'glapi_mapi_tmp.h', - input : ['../../mapi_abi.py', 'gl_and_es_API.xml'], + input : [mapi_abi_py, 'gl_and_es_API.xml'], output : 'glapi_mapi_tmp.h', command : [prog_python2, '@INPUT0@', '--printer', 'glapi', '@INPUT1@'], depend_files : glapi_gen_depends, diff --git a/src/mapi/meson.build b/src/mapi/meson.build index afdde3dd8c..798586bfb0 100644 --- a/src/mapi/meson.build +++ b/src/mapi/meson.build @@ -25,6 +25,8 @@ files_mapi_util = files( 'u_execmem.h', ) +mapi_abi_py = files('mapi_abi.py') + subdir('glapi') if with_shared_glapi subdir('shared-glapi') diff --git a/src/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build index 05fd53b7a2..eca2bd2943 100644 --- a/src/mapi/shared-glapi/meson.build +++ b/src/mapi/shared-glapi/meson.build @@ -29,7 +29,7 @@ files_mapi_glapi = files( shared_glapi_mapi_tmp_h = custom_target( 'shared_glapi_mapi_tmp.h', - input : ['../mapi_abi.py', gl_and_es_api_files], + input : [mapi_abi_py, gl_and_es_api_files], output : 'glapi_mapi_tmp.h', command : [prog_python2, '@INPUT0@', '--printer', 'shared-glapi', '@INPUT1@'], depend_files : api_xml_files, _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
