xserver: Branch 'glucose-2'

[Alan Hourihane]

 hw/xfree86/glucose/Makefile.am |    4 +++-
 xgl/Makefile.am                |    2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree 381be46465fcecf32043629f4fdae3ff7fc7338c (from ac41255d56f82999e1cb5f9bd450bec3de95f3da)
Author: Alan Hourihane <alanh at tungstengraphics.com>
Date:   Fri Sep 28 16:56:42 2007 +0100

    Don't link XGL_LIBS in xgl
    
    Link glucose in with libxgl to pull in symbols.

diff --git a/hw/xfree86/glucose/Makefile.am b/hw/xfree86/glucose/Makefile.am
index 0b7cafa..4e315e7 100644
--- a/hw/xfree86/glucose/Makefile.am
+++ b/hw/xfree86/glucose/Makefile.am
@@ -13,6 +13,8 @@ libglucose_la_SOURCES = \
 	glucosemodule.c
 
 libglucose_la_LIBADD = \
-	../../../glucose/libglucose.la
+	../../../glucose/libglucose.la \
+	../../../xgl/libxgl.la
+
 
 include $(top_srcdir)/cpprules.in
diff --git a/xgl/Makefile.am b/xgl/Makefile.am
index 494a73b..b386ce0 100644
--- a/xgl/Makefile.am
+++ b/xgl/Makefile.am
@@ -38,5 +38,3 @@ libxgl_la_SOURCES = \
 	xgltrap.c \
 	xglwindow.c \
 	xglxv.c
-
-libxgl_la_LIBADD = $(XGL_LIBS)