Revert "build system cleanup: move all files from quartz/xpr/ to quartz/"

This reverts commit 73c6f7983d.

configure.ac

@@ -2030,6 +2030,7 @@ hw/xwin/Makefile
 hw/darwin/Makefile
 hw/darwin/apple/Makefile
 hw/darwin/quartz/Makefile
+hw/darwin/quartz/xpr/Makefile
 hw/kdrive/Makefile
 hw/kdrive/ati/Makefile
 hw/kdrive/chips/Makefile

hw/darwin/quartz/Makefile.am

@@ -4,8 +4,9 @@ AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = \
 	-I$(srcdir) -I$(srcdir)/.. \
-	-I$(top_srcdir)/miext/rootless \
+	-I$(top_srcdir)/miext/rootless
-	-I$(top_srcdir)/miext/rootless/safeAlpha
+
+SUBDIRS = xpr
 
 libXQuartz_a_SOURCES = \
 	X11Application.m \
@@ -18,16 +19,7 @@ libXQuartz_a_SOURCES = \
 	quartzCocoa.m \
 	quartzKeyboard.c \
 	quartzPasteboard.c \
-	quartzStartup.c \
+	quartzStartup.c
-	appledri.c \
-	dri.c \
-	xprAppleWM.c \
-	xprCursor.c \
-	xprFrame.c \
-	xprScreen.c \
-	x-hash.c \
-	x-hook.c \
-	x-list.c
 
 EXTRA_DIST = \
 	X11Application.h \
@@ -40,13 +32,4 @@ EXTRA_DIST = \
 	quartzCursor.c \
 	quartzCursor.h \
 	quartz.h \
-	quartzPasteboard.h \
+	quartzPasteboard.h
-	dri.h \
-	dristruct.h \
-	appledri.h \
-	appledristr.h \
-	x-hash.h \
-	x-hook.h \
-	x-list.h \
-	Xplugin.h \
-	xpr.h