xserver: Branch 'master'

[Eric Anholt]

 configure.ac                  |    1 -
 hw/xfree86/common/Makefile.am |    2 --
 2 files changed, 3 deletions(-)

New commits:
commit ce781cac1b52003da6c025cd29e2c2ad97dbb324
Author: Eric Anholt <eric at anholt.net>
Date:   Thu Sep 11 16:24:20 2008 -0700

    Fix distcheck.

diff --git a/configure.ac b/configure.ac
index 51f17c8..a04a6d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1861,7 +1861,6 @@ hw/vfb/Makefile
 hw/xnest/Makefile
 hw/xwin/Makefile
 hw/xquartz/Makefile
-hw/xquartz/GL/Makefile
 hw/xquartz/bundle/Makefile
 hw/xquartz/doc/Makefile
 hw/xquartz/mach-startup/Makefile
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index de14dbb..745278b 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -54,7 +54,6 @@ DISTCLEANFILES = xf86Build.h
 CLEANFILES = $(BUILT_SOURCES)
 
 EXTRA_DIST = \
-	atKeynames.h \
 	compiler.h \
 	fourcc.h \
 	scoasm.h \
@@ -77,7 +76,6 @@ EXTRA_DIST = \
 	xf86xvmc.h \
 	xf86xvpriv.h \
 	xisb.h \
-	xf86Version.h \
 	xorgVersion.h \
 	xf86Date.h \
 	$(MODEDEFSOURCES) \