Make DRI/GLcore builds srcdir != builddir safe, and invoke symlink-mesa.sh

    in our builddir, not our srcdir.

11 files changed, 113 insertions, 113 deletions

diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index 129ab825c..4d5b8daeb 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -1,16 +1,16 @@
 noinst_LTLIBRARIES = libX.la
 
 INCLUDES = -I@MESA_SOURCE@/include \
-           -I$(srcdir)/../X \
-           -I$(srcdir)/../array_cache \
-           -I$(srcdir)/../glapi \
-           -I$(srcdir)/../main \
-           -I$(srcdir)/../math \
-           -I$(srcdir)/../shader \
-           -I$(srcdir)/../swrast \
-           -I$(srcdir)/../swrast_setup \
-           -I$(srcdir)/../tnl \
-           -I$(srcdir)/.. \
+           -I../X \
+           -I../array_cache \
+           -I../glapi \
+           -I../main \
+           -I../math \
+           -I../shader \
+           -I../swrast \
+           -I../swrast_setup \
+           -I../tnl \
+           -I.. \
            -I$(top_srcdir)/GL/glx \
            -I$(top_srcdir)/GL/include
 
diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am
index 506cad714..318941c56 100644
--- a/GL/mesa/array_cache/Makefile.am
+++ b/GL/mesa/array_cache/Makefile.am
@@ -1,15 +1,15 @@
 noinst_LTLIBRARIES = libac.la
 
 INCLUDES = -I@MESA_SOURCE@/include \
-           -I$(srcdir)/../X \
-           -I$(srcdir)/../array_cache \
-           -I$(srcdir)/../glapi \
-           -I$(srcdir)/../main \
-           -I$(srcdir)/../math \
-           -I$(srcdir)/../shader \
-           -I$(srcdir)/../swrast \
-           -I$(srcdir)/../swrast_setup \
-           -I$(srcdir)/../tnl \
-           -I$(srcdir)/..
+           -I../X \
+           -I../array_cache \
+           -I../glapi \
+           -I../main \
+           -I../math \
+           -I../shader \
+           -I../swrast \
+           -I../swrast_setup \
+           -I../tnl \
+           -I..
 
 nodist_libac_la_SOURCES = ac_context.c ac_import.c
diff --git a/GL/mesa/glapi/Makefile.am b/GL/mesa/glapi/Makefile.am
index 02f7e8951..5deb565a7 100644
--- a/GL/mesa/glapi/Makefile.am
+++ b/GL/mesa/glapi/Makefile.am
@@ -1,15 +1,15 @@
 noinst_LTLIBRARIES = libglapi.la
 
 INCLUDES = -I@MESA_SOURCE@/include \
-           -I$(srcdir)/../X \
-           -I$(srcdir)/../array_cache \
-           -I$(srcdir)/../glapi \
-           -I$(srcdir)/../main \
-           -I$(srcdir)/../math \
-           -I$(srcdir)/../shader \
-           -I$(srcdir)/../swrast \
-           -I$(srcdir)/../swrast_setup \
-           -I$(srcdir)/../tnl \
-           -I$(srcdir)/..
+           -I../X \
+           -I../array_cache \
+           -I../glapi \
+           -I../main \
+           -I../math \
+           -I../shader \
+           -I../swrast \
+           -I../swrast_setup \
+           -I../tnl \
+           -I..
 
 nodist_libglapi_la_SOURCES = glapi.c glthread.c
diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
index f7a0af291..fe62ff980 100644
--- a/GL/mesa/main/Makefile.am
+++ b/GL/mesa/main/Makefile.am
@@ -1,16 +1,16 @@
 noinst_LTLIBRARIES = libmain.la
 
 INCLUDES = -I@MESA_SOURCE@/include \
-           -I$(srcdir)/../X \
-           -I$(srcdir)/../array_cache \
-           -I$(srcdir)/../glapi \
-           -I$(srcdir)/../main \
-           -I$(srcdir)/../math \
-           -I$(srcdir)/../shader \
-           -I$(srcdir)/../swrast \
-           -I$(srcdir)/../swrast_setup \
-           -I$(srcdir)/../tnl \
-           -I$(srcdir)/..
+           -I../X \
+           -I../array_cache \
+           -I../glapi \
+           -I../main \
+           -I../math \
+           -I../shader \
+           -I../swrast \
+           -I../swrast_setup \
+           -I../tnl \
+           -I..
 
 if NEED_VSNPRINTF
 VSNPRINTF_SOURCES = vsnprintf.c
diff --git a/GL/mesa/math/Makefile.am b/GL/mesa/math/Makefile.am
index 6661e944d..0f770032e 100644
--- a/GL/mesa/math/Makefile.am
+++ b/GL/mesa/math/Makefile.am
@@ -1,16 +1,16 @@
 noinst_LTLIBRARIES = libmath.la
 
 INCLUDES = -I@MESA_SOURCE@/include \
-           -I$(srcdir)/../X \
-           -I$(srcdir)/../array_cache \
-           -I$(srcdir)/../glapi \
-           -I$(srcdir)/../main \
-           -I$(srcdir)/../math \
-           -I$(srcdir)/../shader \
-           -I$(srcdir)/../swrast \
-           -I$(srcdir)/../swrast_setup \
-           -I$(srcdir)/../tnl \
-           -I$(srcdir)/..
+           -I../X \
+           -I../array_cache \
+           -I../glapi \
+           -I../main \
+           -I../math \
+           -I../shader \
+           -I../swrast \
+           -I../swrast_setup \
+           -I../tnl \
+           -I..
 
 nodist_libmath_la_SOURCES = m_debug_clip.c \
                        m_debug_norm.c \
diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am
index 886a08512..7827416ae 100644
--- a/GL/mesa/shader/Makefile.am
+++ b/GL/mesa/shader/Makefile.am
@@ -3,18 +3,18 @@ SUBDIRS = grammar slang
 noinst_LTLIBRARIES = libshader.la
 
 INCLUDES = -I@MESA_SOURCE@/include \
-           -I$(srcdir)/../X \
-           -I$(srcdir)/../array_cache \
-           -I$(srcdir)/../glapi \
-           -I$(srcdir)/../main \
-           -I$(srcdir)/../math \
-           -I$(srcdir)/../shader \
-	   -I$(srcdir)/../shader/grammar \
-	   -I$(srcdir)/../shader/slang \
-           -I$(srcdir)/../swrast \
-           -I$(srcdir)/../swrast_setup \
-           -I$(srcdir)/../tnl \
-           -I$(srcdir)/..
+           -I../X \
+           -I../array_cache \
+           -I../glapi \
+           -I../main \
+           -I../math \
+           -I../shader \
+	   -I../shader/grammar \
+	   -I../shader/slang \
+           -I../swrast \
+           -I../swrast_setup \
+           -I../tnl \
+           -I..
 
 nodist_libshader_la_SOURCES = arbfragparse.c \
                       arbprogparse.c \
diff --git a/GL/mesa/shader/grammar/Makefile.am b/GL/mesa/shader/grammar/Makefile.am
index 25c84e5b9..2c97d0bc2 100644
--- a/GL/mesa/shader/grammar/Makefile.am
+++ b/GL/mesa/shader/grammar/Makefile.am
@@ -1,15 +1,15 @@
 noinst_LTLIBRARIES = libgrammar.la
 
 INCLUDES = -I@MESA_SOURCE@/include \
-           -I$(srcdir)/../../X \
-           -I$(srcdir)/../../array_cache \
-           -I$(srcdir)/../../glapi \
-           -I$(srcdir)/../../main \
-           -I$(srcdir)/../../math \
-           -I$(srcdir)/../../shader \
-           -I$(srcdir)/../../swrast \
-           -I$(srcdir)/../../swrast_setup \
-           -I$(srcdir)/../../tnl \
-           -I$(srcdir)/../..
+           -I../../X \
+           -I../../array_cache \
+           -I../../glapi \
+           -I../../main \
+           -I../../math \
+           -I../../shader \
+           -I../../swrast \
+           -I../../swrast_setup \
+           -I../../tnl \
+           -I../..
 
 nodist_libgrammar_la_SOURCES = grammar_mesa.c
diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am
index 19b6c249f..8d0430399 100644
--- a/GL/mesa/shader/slang/Makefile.am
+++ b/GL/mesa/shader/slang/Makefile.am
@@ -1,17 +1,17 @@
 noinst_LTLIBRARIES = libslang.la
 
 INCLUDES = -I@MESA_SOURCE@/include \
-           -I$(srcdir)/../grammar \
-           -I$(srcdir)/../../X \
-           -I$(srcdir)/../../array_cache \
-           -I$(srcdir)/../../glapi \
-           -I$(srcdir)/../../main \
-           -I$(srcdir)/../../math \
-           -I$(srcdir)/../../shader \
-           -I$(srcdir)/../../swrast \
-           -I$(srcdir)/../../swrast_setup \
-           -I$(srcdir)/../../tnl \
-           -I$(srcdir)/../..
+           -I../grammar \
+           -I../../X \
+           -I../../array_cache \
+           -I../../glapi \
+           -I../../main \
+           -I../../math \
+           -I../../shader \
+           -I../../swrast \
+           -I../../swrast_setup \
+           -I../../tnl \
+           -I../..
 
 nodist_libslang_la_SOURCES = slang_assemble_assignment.c \
 		      slang_assemble.c \
diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am
index b18157432..b92786d2d 100644
--- a/GL/mesa/swrast/Makefile.am
+++ b/GL/mesa/swrast/Makefile.am
@@ -1,16 +1,16 @@
 noinst_LTLIBRARIES = libswrast.la
 
 INCLUDES = -I@MESA_SOURCE@/include \
-           -I$(srcdir)/../X \
-           -I$(srcdir)/../array_cache \
-           -I$(srcdir)/../glapi \
-           -I$(srcdir)/../main \
-           -I$(srcdir)/../math \
-           -I$(srcdir)/../shader \
-           -I$(srcdir)/../swrast \
-           -I$(srcdir)/../swrast_setup \
-           -I$(srcdir)/../tnl \
-           -I$(srcdir)/..
+           -I../X \
+           -I../array_cache \
+           -I../glapi \
+           -I../main \
+           -I../math \
+           -I../shader \
+           -I../swrast \
+           -I../swrast_setup \
+           -I../tnl \
+           -I..
 
 nodist_libswrast_la_SOURCES = s_aaline.c \
                       s_aatriangle.c \
diff --git a/GL/mesa/swrast_setup/Makefile.am b/GL/mesa/swrast_setup/Makefile.am
index 40e6edb17..b40dfdcdf 100644
--- a/GL/mesa/swrast_setup/Makefile.am
+++ b/GL/mesa/swrast_setup/Makefile.am
@@ -1,15 +1,15 @@
 noinst_LTLIBRARIES = libss.la
 
 INCLUDES = -I@MESA_SOURCE@/include \
-           -I$(srcdir)/../X \
-           -I$(srcdir)/../array_cache \
-           -I$(srcdir)/../glapi \
-           -I$(srcdir)/../main \
-           -I$(srcdir)/../math \
-           -I$(srcdir)/../shader \
-           -I$(srcdir)/../swrast \
-           -I$(srcdir)/../swrast_setup \
-           -I$(srcdir)/../tnl \
-           -I$(srcdir)/..
+           -I../X \
+           -I../array_cache \
+           -I../glapi \
+           -I../main \
+           -I../math \
+           -I../shader \
+           -I../swrast \
+           -I../swrast_setup \
+           -I../tnl \
+           -I..
 
 nodist_libss_la_SOURCES = ss_context.c ss_triangle.c
diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am
index 02d2c4d5f..caf02c4b1 100644
--- a/GL/mesa/tnl/Makefile.am
+++ b/GL/mesa/tnl/Makefile.am
@@ -1,16 +1,16 @@
 noinst_LTLIBRARIES = libtnl.la
 
 INCLUDES = -I@MESA_SOURCE@/include \
-           -I$(srcdir)/../X \
-           -I$(srcdir)/../array_cache \
-           -I$(srcdir)/../glapi \
-           -I$(srcdir)/../main \
-           -I$(srcdir)/../math \
-           -I$(srcdir)/../shader \
-           -I$(srcdir)/../swrast \
-           -I$(srcdir)/../swrast_setup \
-           -I$(srcdir)/../tnl \
-           -I$(srcdir)/..
+           -I../X \
+           -I../array_cache \
+           -I../glapi \
+           -I../main \
+           -I../math \
+           -I../shader \
+           -I../swrast \
+           -I../swrast_setup \
+           -I../tnl \
+           -I..
 
 nodist_libtnl_la_SOURCES = t_array_api.c \
                       t_array_import.c \