mirror of
https://github.com/X11Libre/xserver.git
synced 2026-04-14 17:18:09 +00:00
Make DRI/GLcore builds srcdir != builddir safe, and invoke symlink-mesa.sh
in our builddir, not our srcdir.
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user