xserver: Branch 'server-1.2-branch'

[Adam Jackson]

 GL/glx/Makefile.am         |   10 +++++-----
 hw/xfree86/doc/Makefile.am |    3 ---
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
diff-tree 216bccb00cdede48a6c271dc037eb96cc8c71eb8 (from b07d79614dd27e62159ca52bb1496b550a5a7d83)
Author: Adam Jackson <ajax at benzedrine.nwnk.net>
Date:   Wed Nov 8 16:17:20 2006 -0500

    'make dist' fixes.
    (cherry picked from 0409e1627a167db2efc1355f292d3c02a6989ffc commit)

diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am
index 44d9cf9..8184f60 100644
--- a/GL/glx/Makefile.am
+++ b/GL/glx/Makefile.am
@@ -28,7 +28,11 @@ INCLUDES = \
 	-I$(top_srcdir)/mi
 
 
-nodist_libglx_la_SOURCES = indirect_size.h
+nodist_libglx_la_SOURCES = indirect_size.h \
+			   glapi.c \
+			   glcontextmodes.c \
+			   glcontextmode.h \
+			   glthread.c
 
 libglxdri_la_SOURCES = \
         glxdri.c \
@@ -37,10 +41,6 @@ libglxdri_la_SOURCES = \
 
 libglx_la_SOURCES = \
         g_disptab.h \
-        glapi.c \
-        glcontextmodes.c \
-        glcontextmodes.h \
-        glthread.c \
         glxcmds.c \
         glxcmdsswap.c \
         glxcontext.h \
diff --git a/hw/xfree86/doc/Makefile.am b/hw/xfree86/doc/Makefile.am
index 55e69b0..6d8f4d2 100644
--- a/hw/xfree86/doc/Makefile.am
+++ b/hw/xfree86/doc/Makefile.am
@@ -5,9 +5,6 @@ SUBDIRS = man
 endif
 
 EXTRA_DIST = \
-	changelogs/CHANGELOG \
-	changelogs/CHANGELOG.ND \
-	changelogs/CHANGELOG.R5 \
 	README.DRI \
 	README.fonts \
 	README.rapidaccess