xserver: Branch 'xorg-server-1.4-apple' - 2 commits

[Jeremy Huddleston]

 GL/Makefile.am             |    2 +-
 hw/xquartz/xpr/Makefile.am |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit ede60ebc6fd55a6583bcd872bdb54ecd2d418503
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Apr 23 11:35:24 2008 -0700

    Don't need to include indirect.c twice

diff --git a/hw/xquartz/xpr/Makefile.am b/hw/xquartz/xpr/Makefile.am
index d74cf7d..12009fb 100644
--- a/hw/xquartz/xpr/Makefile.am
+++ b/hw/xquartz/xpr/Makefile.am
@@ -14,7 +14,6 @@ Xquartz_SOURCES = \
 	xprEvent.c \
 	xprFrame.c \
 	xprScreen.c \
-	../../../GL/apple/indirect.c \
 	x-hash.c \
 	x-hook.c \
 	x-list.c
commit 975cc5d0b246e9d741de71bcb56fc4de21e264d1
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Wed Apr 23 11:07:09 2008 -0700

    Removed apple from GL/Makefile.am's SUBDIRS

diff --git a/GL/Makefile.am b/GL/Makefile.am
index 4e8337a..dc20821 100644
--- a/GL/Makefile.am
+++ b/GL/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = glx mesa apple
+SUBDIRS = glx mesa
 
 WINDOWS_EXTRAS = \
 	windows/ChangeLog \