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

[Ben Byer]

 hw/darwin/Makefile.am            |   12 ++++++++++++
 hw/darwin/bundle/Makefile.am     |    1 +
 hw/darwin/quartz/xpr/Makefile.am |    2 ++
 hw/darwin/utils/Makefile.am      |    1 +
 4 files changed, 16 insertions(+)

New commits:
commit 6b6b1d09bff6b31a57bc02a3887a54f4ef8c6cb2
Author: Ben Byer <bbyer at bbyer.apple.com>
Date:   Mon Oct 29 18:11:10 2007 -0700

    make dist fixes

diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index 9222f57..bfde6f6 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -314,4 +314,16 @@ EXTRA_DIST = \
 	darwinKeyboard.c \
 	darwinKeyboard.h \
 	darwinXinput.c \
+	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 \
+	apple/English.lproj/main.nib/classes.nib \
+	apple/English.lproj/main.nib/info.nib \
+	apple/English.lproj/main.nib/keyedobjects.nib \
+	apple/X11.xcodeproj/project.pbxproj \
 	XDarwin.man
diff --git a/hw/darwin/bundle/Makefile.am b/hw/darwin/bundle/Makefile.am
index dee34fd..f02be74 100644
--- a/hw/darwin/bundle/Makefile.am
+++ b/hw/darwin/bundle/Makefile.am
@@ -35,4 +35,5 @@ CLEANFILES = startXClients
 
 EXTRA_DIST = \
 	XDarwin.icns \
+	startXClients.cpp \
 	Info.plist
diff --git a/hw/darwin/quartz/xpr/Makefile.am b/hw/darwin/quartz/xpr/Makefile.am
index 980c7a4..7ebcba7 100644
--- a/hw/darwin/quartz/xpr/Makefile.am
+++ b/hw/darwin/quartz/xpr/Makefile.am
@@ -22,6 +22,8 @@ xprbundledir = @APPLE_APPLICATIONS_DIR@/Resources/xpr.bundle/Contents/MacOS
 EXTRA_DIST = \
 	dri.h \
 	dristruct.h \
+	appledri.h \
+	appledristr.h \
 	x-hash.h \
 	x-hook.h \
 	x-list.h \
diff --git a/hw/darwin/utils/Makefile.am b/hw/darwin/utils/Makefile.am
index 92bf151..76cb793 100644
--- a/hw/darwin/utils/Makefile.am
+++ b/hw/darwin/utils/Makefile.am
@@ -8,5 +8,6 @@ man1_MANS = dumpkeymap.man
 
 EXTRA_DIST = \
 	     README.txt \
+	     event_status_driver.h \
 	     dumpkeymap.man