xserver: Branch 'xorg-server-1.2-apple'

[Jeremy Huddleston]

 hw/darwin/Makefile.am        |    4 +---
 hw/darwin/quartz/Makefile.am |    2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3a843e26a672a0ecf84952ec9f5e5bceeccf00c0
Author: Jeremy Huddleston <jeremy at tifa.local>
Date:   Mon Nov 19 19:16:19 2007 -0800

    Darwin: Fixed make dist
    Added/corrected missing EXTRA_DIST entries.

diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index a77c006..f1740e3 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -78,14 +78,12 @@ clean-local: x11app-clean x11launcher-clean
 endif
 
 EXTRA_DIST = \
+	Xquartz.man \
 	darwinClut8.h \
 	darwin.h \
 	darwinKeyboard.h \
-	apple/X11Application.h \
-	apple/X11Controller.h \
 	apple/Info.plist \
 	apple/X11.icns \
-	apple/Xquartz.man \
 	apple/bundle-main.c \
 	apple/English.lproj/InfoPlist.strings \
 	apple/English.lproj/Localizable.strings \
diff --git a/hw/darwin/quartz/Makefile.am b/hw/darwin/quartz/Makefile.am
index 44b52e7..4c650e6 100644
--- a/hw/darwin/quartz/Makefile.am
+++ b/hw/darwin/quartz/Makefile.am
@@ -20,6 +20,8 @@ libXQuartz_a_SOURCES = \
 	          quartzStartup.c
 
 EXTRA_DIST = \
+	X11Application.h \
+	X11Controller.h \
 	applewmExt.h \
 	keysym2ucs.h \
 	pseudoramiX.h \