summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2017-11-21 15:07:50 +0000
committerEric Engestrom <[email protected]>2017-11-23 09:44:16 +0000
commitf9cb2370f3404501c2b594ac116bfb6bfe878e87 (patch)
tree668a954c6cfcf7a2ee601d0caa251e47bc094161
parentd16af7355900703514d95411b222e6e028252d66 (diff)
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]>
-rw-r--r--src/mapi/es1api/meson.build2
-rw-r--r--src/mapi/es2api/meson.build2
-rw-r--r--src/mapi/glapi/gen/meson.build2
-rw-r--r--src/mapi/meson.build2
-rw-r--r--src/mapi/shared-glapi/meson.build2
5 files changed, 6 insertions, 4 deletions
diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build
index e8b9066a5f7..36adde4c48c 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 7e868d77b31..be5b8ab204f 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 69ef57bc146..599f094e998 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 afdde3dd8cc..798586bfb0c 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 05fd53b7a25..eca2bd29439 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,