mesa: automake: list builddir before srcdir
authorEmil Velikov <emil.velikov@collabora.com>
Mon, 18 Jul 2016 18:12:17 +0000 (19:12 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Wed, 20 Jul 2016 12:30:50 +0000 (13:30 +0100)
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>
src/mesa/Makefile.sources

index d95153d5fd5a87c32edd26d676eaf77e84f9cdc3..aa06860a73e2d95e484bb903d2ac677d14e6a7d4 100644 (file)
@@ -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