Mesa (master): mesa: automake: list builddir before srcdir
Emil Velikov
evelikov at kemper.freedesktop.org
Wed Jul 20 15:15:49 UTC 2016
Module: Mesa
Branch: master
Commit: eafa82e20e35c532bd2918c62d0100cbbecc7f1f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=eafa82e20e35c532bd2918c62d0100cbbecc7f1f
Author: Emil Velikov <emil.velikov at collabora.com>
Date: Mon Jul 18 19:12:17 2016 +0100
mesa: automake: list builddir before srcdir
In the case of building in out-of-tree fashion, while having generated
in-tree sources, the latter [likely stale] files will be used.
Flip the order to prevent that.
Cc: "11.2 12.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
src/mesa/Makefile.sources | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
index d95153d..aa06860 100644
--- a/src/mesa/Makefile.sources
+++ b/src/mesa/Makefile.sources
@@ -649,11 +649,11 @@ INCLUDE_DIRS = \
-I$(top_builddir)/src \
-I$(top_srcdir)/src \
-I$(top_builddir)/src/compiler/nir \
- -I$(top_srcdir)/src/mesa \
-I$(top_builddir)/src/mesa \
- -I$(top_srcdir)/src/mesa/main \
+ -I$(top_srcdir)/src/mesa \
-I$(top_builddir)/src/mesa/main \
- -I$(top_srcdir)/src/mapi \
+ -I$(top_srcdir)/src/mesa/main \
-I$(top_builddir)/src/mapi \
+ -I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary
More information about the mesa-commit
mailing list