meson: add variable for mapi_abi.py instead of going back up the tree

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

diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
index e8b9066a5f7d00c2a09ee09b61ce8dfe686166bb..36adde4c48c1c800b5c1f26fe5355e6ea60d4648 100644 (file)
--- 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 7e868d77b313602c3d2a51f3cc49edc03eee8e59..be5b8ab204f6e1af1372d9e4136af18e83c6ad78 100644 (file)
--- 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 69ef57bc1460e8f924115f4f59a60e648656685a..599f094e998896e049d245881aff43d52898dd03 100644 (file)
--- 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 afdde3dd8cc31f96ca977208eff87c345d070d38..798586bfb0cc80eb5ed6ce9eb01ded40cf1fa552 100644 (file)
--- 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 05fd53b7a25c55585109ccd962ff4ce9cc410101..eca2bd29439d86117a13b6776b814433c120b4f7 100644 (file)
--- 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,