summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2009-09-29 06:11:54 -0700
committerDan Nicholson <dbn.lists@gmail.com>2009-09-29 06:11:54 -0700
commit81e754dfd0fbed32efe8f3cc89675e0ff4f3b86d (patch)
tree4e33b4cb13ff3d2aff7183a057fa3b0ee7291df8
parentf6666050e90de1cb3bd32160ea64261a47e2ee50 (diff)
xts5: Flatten Xopen directory more
-rw-r--r--xts5/Xopen/.gitignore8
-rw-r--r--xts5/Xopen/Makefile.am8
-rw-r--r--xts5/Xopen/XAllocNamedColor.m (renamed from xts5/Xopen/XAllocNamedColor/XAllocNamedColor.m)2
-rw-r--r--xts5/Xopen/XCreateFontCursor.m (renamed from xts5/Xopen/XCreateFontCursor/XCreateFontCursor.m)0
-rw-r--r--xts5/Xopen/XLookupColor.m (renamed from xts5/Xopen/XLookupColor/XLookupColor.m)2
-rw-r--r--xts5/Xopen/cursorfont.m (renamed from xts5/Xopen/cursorfont/cursorfont.m)0
-rw-r--r--xts5/scenarios/Xopen_scen8
-rw-r--r--xts5/tet_scen8
8 files changed, 18 insertions, 18 deletions
diff --git a/xts5/Xopen/.gitignore b/xts5/Xopen/.gitignore
index 7754bef0..9c50c431 100644
--- a/xts5/Xopen/.gitignore
+++ b/xts5/Xopen/.gitignore
@@ -1,8 +1,8 @@
-XAllocNamedColor/XAllocNamedColor
-cursorfont/cursorfont
-XCreateFontCursor/XCreateFontCursor
+XAllocNamedColor
+cursorfont
+XCreateFontCursor
keysym/keysym
keysymdef/keysymdef
XKeysymToKeycode/XKeysymToKeycode
-XLookupColor/XLookupColor
+XLookupColor
XStringToKeysym/XStringToKeysym
diff --git a/xts5/Xopen/Makefile.am b/xts5/Xopen/Makefile.am
index 34f29a7c..ce1dcf16 100644
--- a/xts5/Xopen/Makefile.am
+++ b/xts5/Xopen/Makefile.am
@@ -9,13 +9,13 @@ BUILT_SOURCES = $(tprogs:$(EXEEXT)=.c)
CLEANFILES = $(BUILT_SOURCES)
tprogs = \
- XAllocNamedColor/XAllocNamedColor \
- cursorfont/cursorfont \
- XCreateFontCursor/XCreateFontCursor \
+ XAllocNamedColor \
+ cursorfont \
+ XCreateFontCursor \
keysym/keysym \
keysymdef/keysymdef \
XKeysymToKeycode/XKeysymToKeycode \
- XLookupColor/XLookupColor \
+ XLookupColor \
XStringToKeysym/XStringToKeysym
keysym_keysym_SOURCES = \
diff --git a/xts5/Xopen/XAllocNamedColor/XAllocNamedColor.m b/xts5/Xopen/XAllocNamedColor.m
index 94778e31..174d10fb 100644
--- a/xts5/Xopen/XAllocNamedColor/XAllocNamedColor.m
+++ b/xts5/Xopen/XAllocNamedColor.m
@@ -20,7 +20,7 @@ SOFTWARE.
>># Project: VSW5
>>#
->># File: xts5/Xopen/XAllocNamedColor/XAllocNamedColor.m
+>># File: xts5/Xopen/XAllocNamedColor.m
>>#
>># Description:
>># Tests for XAllocNamedColor()
diff --git a/xts5/Xopen/XCreateFontCursor/XCreateFontCursor.m b/xts5/Xopen/XCreateFontCursor.m
index 37a2f60f..37a2f60f 100644
--- a/xts5/Xopen/XCreateFontCursor/XCreateFontCursor.m
+++ b/xts5/Xopen/XCreateFontCursor.m
diff --git a/xts5/Xopen/XLookupColor/XLookupColor.m b/xts5/Xopen/XLookupColor.m
index 1a43824a..ed870d6d 100644
--- a/xts5/Xopen/XLookupColor/XLookupColor.m
+++ b/xts5/Xopen/XLookupColor.m
@@ -20,7 +20,7 @@ SOFTWARE.
>># Project: VSW5
>>#
->># File: xts5/Xopen/XLookupColor/XLookupColor.m
+>># File: xts5/Xopen/XLookupColor.m
>>#
>># Description:
>># Tests for XLookupColor()
diff --git a/xts5/Xopen/cursorfont/cursorfont.m b/xts5/Xopen/cursorfont.m
index 8fc8803a..8fc8803a 100644
--- a/xts5/Xopen/cursorfont/cursorfont.m
+++ b/xts5/Xopen/cursorfont.m
diff --git a/xts5/scenarios/Xopen_scen b/xts5/scenarios/Xopen_scen
index 8b83c740..9eb667f2 100644
--- a/xts5/scenarios/Xopen_scen
+++ b/xts5/scenarios/Xopen_scen
@@ -55,11 +55,11 @@
#
"VSW5TESTSUITE CASE XAllocNamedColor 7"
- /Xopen/XAllocNamedColor/XAllocNamedColor
+ /Xopen/XAllocNamedColor
"VSW5TESTSUITE CASE cursorfont 32"
- /Xopen/cursorfont/cursorfont
+ /Xopen/cursorfont
"VSW5TESTSUITE CASE XCreateFontCursor 31"
- /Xopen/XCreateFontCursor/XCreateFontCursor
+ /Xopen/XCreateFontCursor
"VSW5TESTSUITE CASE keysym 7"
/Xopen/keysym/keysym
"VSW5TESTSUITE CASE keysymdef 15"
@@ -67,6 +67,6 @@
"VSW5TESTSUITE CASE XKeysymToKeycode 14"
/Xopen/XKeysymToKeycode/XKeysymToKeycode
"VSW5TESTSUITE CASE XLookupColor 7"
- /Xopen/XLookupColor/XLookupColor
+ /Xopen/XLookupColor
"VSW5TESTSUITE CASE XStringToKeysym 14"
/Xopen/XStringToKeysym/XStringToKeysym
diff --git a/xts5/tet_scen b/xts5/tet_scen
index 92e8676d..b7c9c163 100644
--- a/xts5/tet_scen
+++ b/xts5/tet_scen
@@ -3069,15 +3069,15 @@ XUnloadFont
xXAllocNamedColor
"VSW5TESTSUITE CASE XAllocNamedColor 7"
- /Xopen/XAllocNamedColor/XAllocNamedColor
+ /Xopen/XAllocNamedColor
xcursorfont
"VSW5TESTSUITE CASE cursorfont 32"
- /Xopen/cursorfont/cursorfont
+ /Xopen/cursorfont
xXCreateFontCursor
"VSW5TESTSUITE CASE XCreateFontCursor 31"
- /Xopen/XCreateFontCursor/XCreateFontCursor
+ /Xopen/XCreateFontCursor
xkeysym
"VSW5TESTSUITE CASE keysym 7"
@@ -3093,7 +3093,7 @@ xXKeysymToKeycode
xXLookupColor
"VSW5TESTSUITE CASE XLookupColor 7"
- /Xopen/XLookupColor/XLookupColor
+ /Xopen/XLookupColor
xXStringToKeysym
"VSW5TESTSUITE CASE XStringToKeysym 14"