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

XQuartz · Dec 4, 2007 · 73c6f79 · 73c6f79
1 parent 4dcd910
commit 73c6f79
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 6 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2030,7 +2030,6 @@ 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

diff --git a/hw/darwin/quartz/Makefile.am b/hw/darwin/quartz/Makefile.am
@@ -4,9 +4,8 @@ AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = \
 	-I$(srcdir) -I$(srcdir)/.. \
-	-I$(top_srcdir)/miext/rootless
-
-SUBDIRS = xpr
+	-I$(top_srcdir)/miext/rootless \
+	-I$(top_srcdir)/miext/rootless/safeAlpha
 
 libXQuartz_a_SOURCES = \
 	X11Application.m \
@@ -19,7 +18,16 @@ 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 \
@@ -32,4 +40,13 @@ 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
diff --git a/hw/darwin/quartz/xpr/Xplugin.h → hw/darwin/quartz/Xplugin.h b/hw/darwin/quartz/xpr/Xplugin.h → hw/darwin/quartz/Xplugin.h
diff --git a/hw/darwin/quartz/xpr/appledri.c → hw/darwin/quartz/appledri.c b/hw/darwin/quartz/xpr/appledri.c → hw/darwin/quartz/appledri.c
diff --git a/hw/darwin/quartz/xpr/appledri.h → hw/darwin/quartz/appledri.h b/hw/darwin/quartz/xpr/appledri.h → hw/darwin/quartz/appledri.h
diff --git a/hw/darwin/quartz/xpr/appledristr.h → hw/darwin/quartz/appledristr.h b/hw/darwin/quartz/xpr/appledristr.h → hw/darwin/quartz/appledristr.h
diff --git a/hw/darwin/quartz/xpr/dri.c → hw/darwin/quartz/dri.c b/hw/darwin/quartz/xpr/dri.c → hw/darwin/quartz/dri.c
diff --git a/hw/darwin/quartz/xpr/dri.h → hw/darwin/quartz/dri.h b/hw/darwin/quartz/xpr/dri.h → hw/darwin/quartz/dri.h
diff --git a/hw/darwin/quartz/xpr/dristruct.h → hw/darwin/quartz/dristruct.h b/hw/darwin/quartz/xpr/dristruct.h → hw/darwin/quartz/dristruct.h
diff --git a/hw/darwin/quartz/xpr/x-hash.c → hw/darwin/quartz/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c → hw/darwin/quartz/x-hash.c
diff --git a/hw/darwin/quartz/xpr/x-hash.h → hw/darwin/quartz/x-hash.h b/hw/darwin/quartz/xpr/x-hash.h → hw/darwin/quartz/x-hash.h
diff --git a/hw/darwin/quartz/xpr/x-hook.c → hw/darwin/quartz/x-hook.c b/hw/darwin/quartz/xpr/x-hook.c → hw/darwin/quartz/x-hook.c
diff --git a/hw/darwin/quartz/xpr/x-hook.h → hw/darwin/quartz/x-hook.h b/hw/darwin/quartz/xpr/x-hook.h → hw/darwin/quartz/x-hook.h
diff --git a/hw/darwin/quartz/xpr/x-list.c → hw/darwin/quartz/x-list.c b/hw/darwin/quartz/xpr/x-list.c → hw/darwin/quartz/x-list.c
diff --git a/hw/darwin/quartz/xpr/x-list.h → hw/darwin/quartz/x-list.h b/hw/darwin/quartz/xpr/x-list.h → hw/darwin/quartz/x-list.h
diff --git a/hw/darwin/quartz/xpr/xpr.h → hw/darwin/quartz/xpr.h b/hw/darwin/quartz/xpr/xpr.h → hw/darwin/quartz/xpr.h
diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c → hw/darwin/quartz/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c → hw/darwin/quartz/xprAppleWM.c
diff --git a/hw/darwin/quartz/xpr/xprCursor.c → hw/darwin/quartz/xprCursor.c b/hw/darwin/quartz/xpr/xprCursor.c → hw/darwin/quartz/xprCursor.c
diff --git a/hw/darwin/quartz/xpr/xprFrame.c → hw/darwin/quartz/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c → hw/darwin/quartz/xprFrame.c
diff --git a/hw/darwin/quartz/xpr/xprScreen.c → hw/darwin/quartz/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c → hw/darwin/quartz/xprScreen.c