xserver: Branch 'glucose-2'

[Jose Fonseca]

 hw/xgl/Makefile.am            |    2 +-
 hw/xgl/glx/Makefile.am        |   12 +++++++-----
 hw/xgl/glx/module/Makefile.am |    4 ++++
 3 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 2b5ac0eafde629bd789f17e54273d206ff5d17a8
Author: José Fonseca <jrfonseca at tungstengraphics.com>
Date:   Thu Oct 18 10:39:41 2007 +0100

    Fix Xgl build.

diff --git a/hw/xgl/Makefile.am b/hw/xgl/Makefile.am
index 080a4fd..68c96f8 100644
--- a/hw/xgl/Makefile.am
+++ b/hw/xgl/Makefile.am
@@ -52,7 +52,7 @@ Xgl_SOURCES = \
 	$(top_srcdir)/fb/fbcmap.c
 
 XGL_LIBS = \
-	$(top_srcdir)/xgl/libxgl.la \
+	$(top_builddir)/xgl/libxgl.la \
 	@XGL_LIBS@ \
 	$(XSERVER_LIBS)
 
diff --git a/hw/xgl/glx/Makefile.am b/hw/xgl/glx/Makefile.am
index 76c4d2d..fc1d9ac 100644
--- a/hw/xgl/glx/Makefile.am
+++ b/hw/xgl/glx/Makefile.am
@@ -9,16 +9,18 @@ SUBDIRS =		  \
 	$(XGL_MODULE_DIRS)
 
 AM_CFLAGS = \
-	-I$(srcdir)/.. \
-	-I$(srcdir)/../glxext \
+	@DIX_CFLAGS@ \
+	@LIBDRM_CFLAGS@ \
+	@DRIPROTO_CFLAGS@ \
+	-DHAVE_XGL_CONFIG_H \
+	-DHAVE_DIX_CONFIG_H \
 	-I$(top_srcdir)/GL/glx \
 	-I$(top_srcdir)/GL/include \
 	-I at MESA_SOURCE@/include \
 	-I at MESA_SOURCE@/src/mesa/glapi \
+	-I$(srcdir)/.. \
+	-I$(srcdir)/../glxext \
 	-I$(top_srcdir)/xgl \
-	 $(DIX_CFLAGS) \
-	-DHAVE_XGL_CONFIG_H \
-	-DHAVE_DIX_CONFIG_H \
 	$(XGLXMODULES_CFLAGS)
 
 noinst_LTLIBRARIES = libxglx.la
diff --git a/hw/xgl/glx/module/Makefile.am b/hw/xgl/glx/module/Makefile.am
index ad132ae..e08e269 100644
--- a/hw/xgl/glx/module/Makefile.am
+++ b/hw/xgl/glx/module/Makefile.am
@@ -6,6 +6,10 @@ AM_CFLAGS = \
 	@DIX_CFLAGS@ \
 	@LIBDRM_CFLAGS@ \
 	@DRIPROTO_CFLAGS@ \
+	-I$(top_srcdir)/GL/glx \
+	-I$(top_srcdir)/GL/include \
+	-I at MESA_SOURCE@/include \
+	-I at MESA_SOURCE@/src/mesa/glapi \
 	-I$(top_srcdir)/xgl \
 	-I$(srcdir)/.. \
 	-I$(srcdir)/../.. \