Module: Mesa
Branch: master
Commit: 85ba409967bb0327b85460639080214b3997fc17
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=85ba409967bb0327b85460639080214b3997fc17
Author: Nicolai Hähnle <nicolai.haeh...@amd.com>
Date: Tue Oct 11 15:43:44 2016 +0200
mapi: fix out-of-tree build dependencies
We shouldn't be using wildcard here in the first place, but changing that
is some effort. As it stands, make -p confirms that glapi_gen_mapi_deps only
contains mapi_abi.py when building outside the Mesa tree.
As a result, only some of the tables were updated when XML files change, but
not the tables for shared glapi. This change ensures that we pick up the
XML files and scripts from the source tree as dependencies also for shared
glapi.
Reviewed-by: Emil Velikov <emil.veli...@collabora.com>
---
src/mapi/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index d6bf5d8..46afe3b 100644
--- a/src/mapi/Makefile.am
+++ b/src/mapi/Makefile.am
@@ -56,8 +56,8 @@ PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
glapi_gen_mapi_deps := \
mapi_abi.py \
- $(wildcard glapi/gen/*.xml) \
- $(wildcard glapi/gen/*.py)
+ $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \
+ $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py)
if HAVE_SHARED_GLAPI
BUILT_SOURCES += shared-glapi/glapi_mapi_tmp.h
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
