From 85ba409967bb0327b85460639080214b3997fc17 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Tue, 11 Oct 2016 15:43:44 +0200 Subject: [PATCH] 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 --- 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 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 -- 2.30.2