xserver: Branch 'xgl-0-0-1'
Alan Hourihane
alanh at kemper.freedesktop.org
Wed Mar 21 14:20:53 EET 2007
GL/mesa/Makefile.am | 2 +-
GL/mesa/X/Makefile.am | 1 -
GL/mesa/array_cache/Makefile.am | 18 ------------------
GL/mesa/glapi/Makefile.am | 1 -
GL/mesa/main/Makefile.am | 1 -
GL/mesa/math/Makefile.am | 1 -
GL/mesa/shader/Makefile.am | 1 -
GL/mesa/shader/grammar/Makefile.am | 1 -
GL/mesa/shader/slang/Makefile.am | 1 -
GL/mesa/swrast/Makefile.am | 1 -
GL/mesa/swrast_setup/Makefile.am | 1 -
GL/mesa/tnl/Makefile.am | 1 -
configure.ac | 2 +-
13 files changed, 2 insertions(+), 30 deletions(-)
New commits:
diff-tree 07e61906aa928213868cb8dd08138774ae6266af (from 513d88cc87cfaa0efb5fe23db4ecee020e0b8efd)
Author: Alan Hourihane <alanh at fairlite.demon.co.uk>
Date: Wed Mar 21 12:20:47 2007 +0000
Update xgl for mesa's vbo changes
diff --git a/GL/mesa/Makefile.am b/GL/mesa/Makefile.am
index 4f225da..5bb50a8 100644
--- a/GL/mesa/Makefile.am
+++ b/GL/mesa/Makefile.am
@@ -5,11 +5,11 @@ noinst_LTLIBRARIES = libGLcore.la
libGLcore_la_SOURCES = dummy.c
libGLcore_la_LIBADD = main/libmain.la \
math/libmath.la \
- vbo/libvbo.la \
swrast/libswrast.la \
swrast_setup/libss.la \
tnl/libtnl.la \
shader/libshader.la \
shader/grammar/libgrammar.la \
shader/slang/libslang.la \
+ vbo/libvbo.la \
X/libX.la
diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
index 17db13b..5cd3cba 100644
--- a/GL/mesa/X/Makefile.am
+++ b/GL/mesa/X/Makefile.am
@@ -2,7 +2,6 @@ noinst_LTLIBRARIES = libX.la
INCLUDES = -I at MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
diff --git a/GL/mesa/array_cache/Makefile.am b/GL/mesa/array_cache/Makefile.am
deleted file mode 100644
index 0374b7c..0000000
--- a/GL/mesa/array_cache/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-noinst_LTLIBRARIES = libac.la
-
-AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ -DUSE_MGL_NAMESPACE
-
-INCLUDES = -I at MESA_SOURCE@/include \
- -I../X \
- -I../array_cache \
- -I../glapi \
- -I../main \
- -I../math \
- -I../shader \
- -I../swrast \
- -I../swrast_setup \
- -I../tnl \
- -I.. \
- -I$(top_srcdir)/hw/xfree86/os-support
-
-nodist_libac_la_SOURCES =
diff --git a/GL/mesa/glapi/Makefile.am b/GL/mesa/glapi/Makefile.am
index 5e960b6..5ebd74e 100644
--- a/GL/mesa/glapi/Makefile.am
+++ b/GL/mesa/glapi/Makefile.am
@@ -4,7 +4,6 @@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINE
INCLUDES = -I at MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
index 074ebed..5996bdd 100644
--- a/GL/mesa/main/Makefile.am
+++ b/GL/mesa/main/Makefile.am
@@ -4,7 +4,6 @@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINE
INCLUDES = -I at MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
diff --git a/GL/mesa/math/Makefile.am b/GL/mesa/math/Makefile.am
index b966a58..2e60fca 100644
--- a/GL/mesa/math/Makefile.am
+++ b/GL/mesa/math/Makefile.am
@@ -4,7 +4,6 @@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINE
INCLUDES = -I at MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am
index a01c977..e4dd784 100644
--- a/GL/mesa/shader/Makefile.am
+++ b/GL/mesa/shader/Makefile.am
@@ -6,7 +6,6 @@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINE
INCLUDES = -I at MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
diff --git a/GL/mesa/shader/grammar/Makefile.am b/GL/mesa/shader/grammar/Makefile.am
index 3c56968..a8991dd 100644
--- a/GL/mesa/shader/grammar/Makefile.am
+++ b/GL/mesa/shader/grammar/Makefile.am
@@ -4,7 +4,6 @@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINE
INCLUDES = -I at MESA_SOURCE@/include \
-I../../X \
- -I../../array_cache \
-I../../glapi \
-I../../main \
-I../../math \
diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am
index a1f347d..6c2c0f3 100644
--- a/GL/mesa/shader/slang/Makefile.am
+++ b/GL/mesa/shader/slang/Makefile.am
@@ -5,7 +5,6 @@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINE
INCLUDES = -I at MESA_SOURCE@/include \
-I../grammar \
-I../../X \
- -I../../array_cache \
-I../../glapi \
-I../../main \
-I../../math \
diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am
index 5465ef0..cca82ff 100644
--- a/GL/mesa/swrast/Makefile.am
+++ b/GL/mesa/swrast/Makefile.am
@@ -4,7 +4,6 @@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINE
INCLUDES = -I at MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
diff --git a/GL/mesa/swrast_setup/Makefile.am b/GL/mesa/swrast_setup/Makefile.am
index b390ece..c3c5d66 100644
--- a/GL/mesa/swrast_setup/Makefile.am
+++ b/GL/mesa/swrast_setup/Makefile.am
@@ -4,7 +4,6 @@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINE
INCLUDES = -I at MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am
index b9546ed..b265d77 100644
--- a/GL/mesa/tnl/Makefile.am
+++ b/GL/mesa/tnl/Makefile.am
@@ -4,7 +4,6 @@ AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINE
INCLUDES = -I at MESA_SOURCE@/include \
-I../X \
- -I../array_cache \
-I../glapi \
-I../main \
-I../math \
diff --git a/configure.ac b/configure.ac
index 5c912ba..2ae2ca8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1610,7 +1610,6 @@ GL/glx/Makefile
GL/include/Makefile
GL/include/GL/Makefile
GL/mesa/Makefile
-GL/mesa/array_cache/Makefile
GL/mesa/glapi/Makefile
GL/mesa/main/Makefile
GL/mesa/math/Makefile
@@ -1620,6 +1619,7 @@ GL/mesa/shader/slang/Makefile
GL/mesa/swrast/Makefile
GL/mesa/swrast_setup/Makefile
GL/mesa/tnl/Makefile
+GL/mesa/vbo/Makefile
GL/mesa/X/Makefile
include/Makefile
afb/Makefile
More information about the xorg-commit
mailing list