xps: Rearrange files, part two.

18 files changed, 18 insertions, 18 deletions

diff --git a/Makefile b/Makefile
index 96ebd0f2..fcfbad39 100644
--- a/Makefile
+++ b/Makefile
@@ -172,22 +172,22 @@ $(MUPDF_OBJ): $(MUPDF_HDR)
 
 MUXPS_HDR := $(FITZ_HDR) xps/muxps.h
 MUXPS_SRC := \
-	xps/xpscommon.c \
-	xps/xpsdoc.c \
-	xps/xpsglyphs.c \
-	xps/xpsgradient.c \
-	xps/xpshash.c \
-	xps/xpsimage.c \
-	xps/xpsjpeg.c \
-	xps/xpsmem.c \
-	xps/xpspage.c \
-	xps/xpspath.c \
-	xps/xpspng.c \
-	xps/xpsresource.c \
-	xps/xpstiff.c \
-	xps/xpstile.c \
-	xps/xpsxml.c \
-	xps/xpszip.c
+	xps/xps_common.c \
+	xps/xps_doc.c \
+	xps/xps_glyphs.c \
+	xps/xps_gradient.c \
+	xps/xps_hash.c \
+	xps/xps_image.c \
+	xps/xps_jpeg.c \
+	xps/xps_page.c \
+	xps/xps_path.c \
+	xps/xps_png.c \
+	xps/xps_resource.c \
+	xps/xps_tiff.c \
+	xps/xps_tile.c \
+	xps/xps_util.c \
+	xps/xps_xml.c \
+	xps/xps_zip.c
 MUXPS_OBJ := $(MUXPS_SRC:xps/%.c=$(OBJDIR)/%.o)
 $(MUXPS_OBJ): $(MUXPS_HDR)
 
@@ -375,8 +375,8 @@ $(PDFINFO_OBJ): $(MUPDF_HDR)
 $(PDFINFO_EXE): $(PDFINFO_OBJ) $(MUPDF_LIB) $(THIRD_LIBS)
 	$(LD_CMD)
 
-XPSDRAW_SRC=xps/xpstop.c
-XPSDRAW_OBJ=$(XPSDRAW_SRC:xps/%.c=$(OBJDIR)/%.o)
+XPSDRAW_SRC=apps/xpsdraw.c
+XPSDRAW_OBJ=$(XPSDRAW_SRC:apps/%.c=$(OBJDIR)/%.o)
 XPSDRAW_EXE=$(OBJDIR)/xpsdraw
 $(XPSDRAW_OBJ): $(MUXPS_HDR)
 $(XPSDRAW_EXE): $(XPSDRAW_OBJ) $(MUXPS_LIB) $(THIRD_LIBS)
diff --git a/xps/xpstop.c b/apps/xpsdraw.c
index 921d677a..921d677a 100644
--- a/xps/xpstop.c
+++ b/apps/xpsdraw.c
diff --git a/xps/xpscommon.c b/xps/xps_common.c
index 7e489ef7..7e489ef7 100644
--- a/xps/xpscommon.c
+++ b/xps/xps_common.c
diff --git a/xps/xpsdoc.c b/xps/xps_doc.c
index 94fb32d7..94fb32d7 100644
--- a/xps/xpsdoc.c
+++ b/xps/xps_doc.c
diff --git a/xps/xpsglyphs.c b/xps/xps_glyphs.c
index 91c7dbcd..91c7dbcd 100644
--- a/xps/xpsglyphs.c
+++ b/xps/xps_glyphs.c
diff --git a/xps/xpsgradient.c b/xps/xps_gradient.c
index 8c877a0b..8c877a0b 100644
--- a/xps/xpsgradient.c
+++ b/xps/xps_gradient.c
diff --git a/xps/xpshash.c b/xps/xps_hash.c
index 71e97097..71e97097 100644
--- a/xps/xpshash.c
+++ b/xps/xps_hash.c
diff --git a/xps/xpsimage.c b/xps/xps_image.c
index ced58bb5..ced58bb5 100644
--- a/xps/xpsimage.c
+++ b/xps/xps_image.c
diff --git a/xps/xpsjpeg.c b/xps/xps_jpeg.c
index 4dc2a7e4..4dc2a7e4 100644
--- a/xps/xpsjpeg.c
+++ b/xps/xps_jpeg.c
diff --git a/xps/xpspage.c b/xps/xps_page.c
index 7659a1a7..7659a1a7 100644
--- a/xps/xpspage.c
+++ b/xps/xps_page.c
diff --git a/xps/xpspath.c b/xps/xps_path.c
index 00e57bee..00e57bee 100644
--- a/xps/xpspath.c
+++ b/xps/xps_path.c
diff --git a/xps/xpspng.c b/xps/xps_png.c
index f59be56d..f59be56d 100644
--- a/xps/xpspng.c
+++ b/xps/xps_png.c
diff --git a/xps/xpsresource.c b/xps/xps_resource.c
index 59dc3f9d..59dc3f9d 100644
--- a/xps/xpsresource.c
+++ b/xps/xps_resource.c
diff --git a/xps/xpstiff.c b/xps/xps_tiff.c
index 4c977ab1..4c977ab1 100644
--- a/xps/xpstiff.c
+++ b/xps/xps_tiff.c
diff --git a/xps/xpstile.c b/xps/xps_tile.c
index 82ec543f..82ec543f 100644
--- a/xps/xpstile.c
+++ b/xps/xps_tile.c
diff --git a/xps/xpsmem.c b/xps/xps_util.c
index 76175d68..76175d68 100644
--- a/xps/xpsmem.c
+++ b/xps/xps_util.c
diff --git a/xps/xpsxml.c b/xps/xps_xml.c
index 397b68ec..397b68ec 100644
--- a/xps/xpsxml.c
+++ b/xps/xps_xml.c
diff --git a/xps/xpszip.c b/xps/xps_zip.c
index ad708bcb..ad708bcb 100644
--- a/xps/xpszip.c
+++ b/xps/xps_zip.c