From: Emil Velikov <emil.velikov@collabora.com>
Date: Mon, 18 Jul 2016 18:12:17 +0000 (+0100)
Subject: mesa: automake: list builddir before srcdir
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eafa82e20e35c532bd2918c62d0100cbbecc7f1f;p=mesa.git

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@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
---

diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources
index d95153d5fd5..aa06860a73e 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