[Mesa-dev] [PATCH 1/3] mesa: automake: list builddir before srcdir

Emil Velikov emil.l.velikov at gmail.com
Mon Jul 18 18:31:45 UTC 2016


From: Emil Velikov <emil.velikov at collabora.com>

In the case of building in out-of-tree fashion, while having generated
in-tree sources, the latter, likely stale, files will be used by the
compiler.

Flip the order so prevent any issue that this may cause.

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
-- 
2.8.2



More information about the mesa-dev mailing list