9 files changed, 54 insertions, 63 deletions
diff --git a/testsuites/itrontests/itronhello/Makefile.am b/testsuites/itrontests/itronhello/Makefile.am
index 5dd35d0551..e9b334460b 100644
--- a/testsuites/itrontests/itronhello/Makefile.am
+++ b/testsuites/itrontests/itronhello/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itronhello
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itronhello.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itronhello.doc itronhello.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itronhello.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itronhello.scn: itronhello.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itronhello.exe \
+$(project_bspdir)/tests/screens/itrontests/itronhello.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itronmbf01/Makefile.am b/testsuites/itrontests/itronmbf01/Makefile.am
index 933c62fcb6..90d77c3713 100644
--- a/testsuites/itrontests/itronmbf01/Makefile.am
+++ b/testsuites/itrontests/itronmbf01/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itronmbf01
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itronmbf01.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itronmbf01.doc itronmbf01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itronmbf01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itronmbf01.scn: itronmbf01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itronmbf01.exe \
+$(project_bspdir)/tests/screens/itrontests/itronmbf01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itronmbox01/Makefile.am b/testsuites/itrontests/itronmbox01/Makefile.am
index 8494611891..cf7a3ba64a 100644
--- a/testsuites/itrontests/itronmbox01/Makefile.am
+++ b/testsuites/itrontests/itronmbox01/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itronmbox01
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itronmbox01.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itronmbox01.doc itronmbox01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itronmbox01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itronmbox01.scn: itronmbox01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itronmbox01.exe \
+$(project_bspdir)/tests/screens/itrontests/itronmbox01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itronsem01/Makefile.am b/testsuites/itrontests/itronsem01/Makefile.am
index bba13e2f95..f8d34be82c 100644
--- a/testsuites/itrontests/itronsem01/Makefile.am
+++ b/testsuites/itrontests/itronsem01/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itronsem01
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itronsem01.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itronsem01.doc itronsem01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itronsem01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itronsem01.scn: itronsem01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itronsem01.exe \
+$(project_bspdir)/tests/screens/itrontests/itronsem01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itrontask01/Makefile.am b/testsuites/itrontests/itrontask01/Makefile.am
index c1dd91b933..8c7ee9a351 100644
--- a/testsuites/itrontests/itrontask01/Makefile.am
+++ b/testsuites/itrontests/itrontask01/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itrontask01
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itrontask01.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itrontask01.doc itrontask01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itrontask01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itrontask01.scn: itrontask01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itrontask01.exe \
+$(project_bspdir)/tests/screens/itrontests/itrontask01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itrontask02/Makefile.am b/testsuites/itrontests/itrontask02/Makefile.am
index fe77ffba4e..54d5bd6aa4 100644
--- a/testsuites/itrontests/itrontask02/Makefile.am
+++ b/testsuites/itrontests/itrontask02/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itrontask02
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itrontask02.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c dormant.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itrontask02.doc itrontask02.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itrontask02.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itrontask02.scn: itrontask02.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itrontask02.exe \
+$(project_bspdir)/tests/screens/itrontests/itrontask02.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itrontask03/Makefile.am b/testsuites/itrontests/itrontask03/Makefile.am
index 60fb4aaac6..549c8bbe3b 100644
--- a/testsuites/itrontests/itrontask03/Makefile.am
+++ b/testsuites/itrontests/itrontask03/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itrontask03
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itrontask03.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c preempt.c task1.c task2.c task3.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itrontask03.doc itrontask03.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itrontask03.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itrontask03.scn: itrontask03.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itrontask03.exe \
+$(project_bspdir)/tests/screens/itrontests/itrontask03.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itrontask04/Makefile.am b/testsuites/itrontests/itrontask04/Makefile.am
index 1165e767fd..ce94c5625f 100644
--- a/testsuites/itrontests/itrontask04/Makefile.am
+++ b/testsuites/itrontests/itrontask04/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itrontask04
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itrontask04.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itrontask04.doc itrontask04.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itrontask04.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itrontask04.scn: itrontask04.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itrontask04.exe \
+$(project_bspdir)/tests/screens/itrontests/itrontask04.scn
 
 $(PGM): ${ARCH}/$(dirstamp)
 
diff --git a/testsuites/itrontests/itrontime01/Makefile.am b/testsuites/itrontests/itrontime01/Makefile.am
index c84d9d698c..c112dabad4 100644
--- a/testsuites/itrontests/itrontime01/Makefile.am
+++ b/testsuites/itrontests/itrontime01/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-TEST = itrontime01
-PGM = ${ARCH}/$(TEST).exe
+PGM = ${ARCH}/itrontime01.exe
 
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = $(TEST).doc $(TEST).scn
+DOCS = itrontime01.doc itrontime01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -25,19 +24,19 @@ $(project_bspdir)/tests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests
 	@: > $(project_bspdir)/tests/$(dirstamp)
 
-$(project_bspdir)/tests/$(TEST).exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
+$(project_bspdir)/tests/itrontime01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
 	$(INSTALL_PROGRAM) $< $@
 
 $(project_bspdir)/tests/screens/itrontests/$(dirstamp):
 	@$(mkdir_p) $(project_bspdir)/tests/screens/itrontests
 	@: > $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
+$(project_bspdir)/tests/screens/itrontests/itrontime01.scn: itrontime01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
 	$(INSTALL_DATA) $< $@
 
 TMPINSTALL_FILES = \
-$(project_bspdir)/tests/$(TEST).exe \
-$(project_bspdir)/tests/screens/itrontests/$(TEST).scn
+$(project_bspdir)/tests/itrontime01.exe \
+$(project_bspdir)/tests/screens/itrontests/itrontime01.scn
 
 $(PGM): ${ARCH}/$(dirstamp)