xts5: Flatten Xlib6 directory more

12 files changed, 40 insertions, 40 deletions

diff --git a/xts5/Xlib6/.gitignore b/xts5/Xlib6/.gitignore
index e0121367..54504df3 100644
--- a/xts5/Xlib6/.gitignore
+++ b/xts5/Xlib6/.gitignore
@@ -1,8 +1,8 @@
-XCreateFontCursor/XCreateFontCursor
-XCreateGlyphCursor/XCreateGlyphCursor
-XCreatePixmap/XCreatePixmap
-XCreatePixmapCursor/XCreatePixmapCursor
-XFreeCursor/XFreeCursor
-XFreePixmap/XFreePixmap
-XQueryBestCursor/XQueryBestCursor
-XRecolorCursor/XRecolorCursor
+XCreateFontCursor
+XCreateGlyphCursor
+XCreatePixmap
+XCreatePixmapCursor
+XFreeCursor
+XFreePixmap
+XQueryBestCursor
+XRecolorCursor
diff --git a/xts5/Xlib6/Makefile.am b/xts5/Xlib6/Makefile.am
index 99832a63..ff749ce1 100644
--- a/xts5/Xlib6/Makefile.am
+++ b/xts5/Xlib6/Makefile.am
@@ -9,11 +9,11 @@ BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
 CLEANFILES = $(BUILT_SOURCES)
 
 tprogs = \
-	XCreateFontCursor/XCreateFontCursor \
-	XCreateGlyphCursor/XCreateGlyphCursor \
-	XCreatePixmap/XCreatePixmap \
-	XCreatePixmapCursor/XCreatePixmapCursor \
-	XFreeCursor/XFreeCursor \
-	XFreePixmap/XFreePixmap \
-	XQueryBestCursor/XQueryBestCursor \
-	XRecolorCursor/XRecolorCursor
+	XCreateFontCursor \
+	XCreateGlyphCursor \
+	XCreatePixmap \
+	XCreatePixmapCursor \
+	XFreeCursor \
+	XFreePixmap \
+	XQueryBestCursor \
+	XRecolorCursor
diff --git a/xts5/Xlib6/XCreateFontCursor/XCreateFontCursor.m b/xts5/Xlib6/XCreateFontCursor.m
index 8f3ccf65..0dc584bd 100644
--- a/xts5/Xlib6/XCreateFontCursor/XCreateFontCursor.m
+++ b/xts5/Xlib6/XCreateFontCursor.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib6/XCreateFontCursor/XCreateFontCursor.m
+>># File: xts5/Xlib6/XCreateFontCursor.m
 >># 
 >># Description:
 >># 	Tests for XCreateFontCursor()
diff --git a/xts5/Xlib6/XCreateGlyphCursor/XCreateGlyphCursor.m b/xts5/Xlib6/XCreateGlyphCursor.m
index a972fe1b..29350924 100644
--- a/xts5/Xlib6/XCreateGlyphCursor/XCreateGlyphCursor.m
+++ b/xts5/Xlib6/XCreateGlyphCursor.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib6/XCreateGlyphCursor/XCreateGlyphCursor.m
+>># File: xts5/Xlib6/XCreateGlyphCursor.m
 >># 
 >># Description:
 >># 	Tests for XCreateGlyphCursor()
diff --git a/xts5/Xlib6/XCreatePixmap/XCreatePixmap.m b/xts5/Xlib6/XCreatePixmap.m
index f4536aef..b866f106 100644
--- a/xts5/Xlib6/XCreatePixmap/XCreatePixmap.m
+++ b/xts5/Xlib6/XCreatePixmap.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib6/XCreatePixmap/XCreatePixmap.m
+>># File: xts5/Xlib6/XCreatePixmap.m
 >># 
 >># Description:
 >># 	Tests for XCreatePixmap()
diff --git a/xts5/Xlib6/XCreatePixmapCursor/XCreatePixmapCursor.m b/xts5/Xlib6/XCreatePixmapCursor.m
index a27471d5..5f8946ec 100644
--- a/xts5/Xlib6/XCreatePixmapCursor/XCreatePixmapCursor.m
+++ b/xts5/Xlib6/XCreatePixmapCursor.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib6/XCreatePixmapCursor/XCreatePixmapCursor.m
+>># File: xts5/Xlib6/XCreatePixmapCursor.m
 >># 
 >># Description:
 >># 	Tests for XCreatePixmapCursor()
diff --git a/xts5/Xlib6/XFreeCursor/XFreeCursor.m b/xts5/Xlib6/XFreeCursor.m
index 98f9b430..e64def0c 100644
--- a/xts5/Xlib6/XFreeCursor/XFreeCursor.m
+++ b/xts5/Xlib6/XFreeCursor.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib6/XFreeCursor/XFreeCursor.m
+>># File: xts5/Xlib6/XFreeCursor.m
 >># 
 >># Description:
 >># 	Tests for XFreeCursor()
diff --git a/xts5/Xlib6/XFreePixmap/XFreePixmap.m b/xts5/Xlib6/XFreePixmap.m
index 8896f15b..e1e0aaf7 100644
--- a/xts5/Xlib6/XFreePixmap/XFreePixmap.m
+++ b/xts5/Xlib6/XFreePixmap.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib6/XFreePixmap/XFreePixmap.m
+>># File: xts5/Xlib6/XFreePixmap.m
 >># 
 >># Description:
 >># 	Tests for XFreePixmap()
diff --git a/xts5/Xlib6/XQueryBestCursor/XQueryBestCursor.m b/xts5/Xlib6/XQueryBestCursor.m
index b235e124..ea4a4315 100644
--- a/xts5/Xlib6/XQueryBestCursor/XQueryBestCursor.m
+++ b/xts5/Xlib6/XQueryBestCursor.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib6/XQueryBestCursor/XQueryBestCursor.m
+>># File: xts5/Xlib6/XQueryBestCursor.m
 >># 
 >># Description:
 >># 	Tests for XQueryBestCursor()
diff --git a/xts5/Xlib6/XRecolorCursor/XRecolorCursor.m b/xts5/Xlib6/XRecolorCursor.m
index a9eafcb0..a991433f 100644
--- a/xts5/Xlib6/XRecolorCursor/XRecolorCursor.m
+++ b/xts5/Xlib6/XRecolorCursor.m
@@ -23,7 +23,7 @@ All Rights Reserved.
 
 >># Project: VSW5
 >># 
->># File: xts5/Xlib6/XRecolorCursor/XRecolorCursor.m
+>># File: xts5/Xlib6/XRecolorCursor.m
 >># 
 >># Description:
 >># 	Tests for XRecolorCursor()
diff --git a/xts5/scenarios/Xlib6_scen b/xts5/scenarios/Xlib6_scen
index 0a6e9108..5c170354 100644
--- a/xts5/scenarios/Xlib6_scen
+++ b/xts5/scenarios/Xlib6_scen
@@ -55,18 +55,18 @@
 #
 
 	"VSW5TESTSUITE CASE XCreatePixmap 6"
-	/Xlib6/XCreatePixmap/XCreatePixmap
+	/Xlib6/XCreatePixmap
 	"VSW5TESTSUITE CASE XCreateFontCursor 3"
-	/Xlib6/XCreateFontCursor/XCreateFontCursor
+	/Xlib6/XCreateFontCursor
 	"VSW5TESTSUITE CASE XCreateGlyphCursor 17"
-	/Xlib6/XCreateGlyphCursor/XCreateGlyphCursor
+	/Xlib6/XCreateGlyphCursor
 	"VSW5TESTSUITE CASE XCreatePixmapCursor 13"
-	/Xlib6/XCreatePixmapCursor/XCreatePixmapCursor
+	/Xlib6/XCreatePixmapCursor
 	"VSW5TESTSUITE CASE XFreeCursor 3"
-	/Xlib6/XFreeCursor/XFreeCursor
+	/Xlib6/XFreeCursor
 	"VSW5TESTSUITE CASE XFreePixmap 3"
-	/Xlib6/XFreePixmap/XFreePixmap
+	/Xlib6/XFreePixmap
 	"VSW5TESTSUITE CASE XQueryBestCursor 2"
-	/Xlib6/XQueryBestCursor/XQueryBestCursor
+	/Xlib6/XQueryBestCursor
 	"VSW5TESTSUITE CASE XRecolorCursor 3"
-	/Xlib6/XRecolorCursor/XRecolorCursor
+	/Xlib6/XRecolorCursor
diff --git a/xts5/tet_scen b/xts5/tet_scen
index 59392c2e..0d623672 100644
--- a/xts5/tet_scen
+++ b/xts5/tet_scen
@@ -2494,35 +2494,35 @@ XTranslateCoordinates
 
 XCreatePixmap
 	"VSW5TESTSUITE CASE XCreatePixmap 6"
-	/Xlib6/XCreatePixmap/XCreatePixmap
+	/Xlib6/XCreatePixmap
 
 XCreateFontCursor
 	"VSW5TESTSUITE CASE XCreateFontCursor 3"
-	/Xlib6/XCreateFontCursor/XCreateFontCursor
+	/Xlib6/XCreateFontCursor
 
 XCreateGlyphCursor
 	"VSW5TESTSUITE CASE XCreateGlyphCursor 17"
-	/Xlib6/XCreateGlyphCursor/XCreateGlyphCursor
+	/Xlib6/XCreateGlyphCursor
 
 XCreatePixmapCursor
 	"VSW5TESTSUITE CASE XCreatePixmapCursor 13"
-	/Xlib6/XCreatePixmapCursor/XCreatePixmapCursor
+	/Xlib6/XCreatePixmapCursor
 
 XFreeCursor
 	"VSW5TESTSUITE CASE XFreeCursor 3"
-	/Xlib6/XFreeCursor/XFreeCursor
+	/Xlib6/XFreeCursor
 
 XFreePixmap
 	"VSW5TESTSUITE CASE XFreePixmap 3"
-	/Xlib6/XFreePixmap/XFreePixmap
+	/Xlib6/XFreePixmap
 
 XQueryBestCursor
 	"VSW5TESTSUITE CASE XQueryBestCursor 2"
-	/Xlib6/XQueryBestCursor/XQueryBestCursor
+	/Xlib6/XQueryBestCursor
 
 XRecolorCursor
 	"VSW5TESTSUITE CASE XRecolorCursor 3"
-	/Xlib6/XRecolorCursor/XRecolorCursor
+	/Xlib6/XRecolorCursor
 
 
 # Discrete tests for Xlib Chapter 7-Color Management Functions