From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Tue, 11 Oct 2016 13:43:44 +0000 (+0200)
Subject: mapi: fix out-of-tree build dependencies
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=85ba409967bb0327b85460639080214b3997fc17;p=mesa.git

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.velikov@collabora.com>
---

diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
index d6bf5d81a3a..46afe3bae60 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