Rework.

32 files changed, 252 insertions, 926 deletions

diff --git a/testsuites/sptests/sp01/Makefile.am b/testsuites/sptests/sp01/Makefile.am
index fd5a8a7726..ff45c5c113 100644
--- a/testsuites/sptests/sp01/Makefile.am
+++ b/testsuites/sptests/sp01/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = sp01.scn sp01.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp01.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp01.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp01.scn: sp01.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp01.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp01.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp02/Makefile.am b/testsuites/sptests/sp02/Makefile.am
index 9336e3602c..76d637120e 100644
--- a/testsuites/sptests/sp02/Makefile.am
+++ b/testsuites/sptests/sp02/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c preempt.c system.h
 
-DOCS = sp02.scn sp02.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp02.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp02.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp02.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp02.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp02.scn: sp02.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp02.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp02.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp03/Makefile.am b/testsuites/sptests/sp03/Makefile.am
index a80781002e..2825101bc8 100644
--- a/testsuites/sptests/sp03/Makefile.am
+++ b/testsuites/sptests/sp03/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c system.h
 
-DOCS = sp03.scn sp03.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp03.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp03.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp03.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp03.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp03.scn: sp03.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp03.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp03.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp04/Makefile.am b/testsuites/sptests/sp04/Makefile.am
index 8b43278a3f..50fa40a4e9 100644
--- a/testsuites/sptests/sp04/Makefile.am
+++ b/testsuites/sptests/sp04/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
 
-DOCS = sp04.scn sp04.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp04.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp04.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp04.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp04.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp04.scn: sp04.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp04.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp04.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp05/Makefile.am b/testsuites/sptests/sp05/Makefile.am
index ac1bd05b8e..625d02c671 100644
--- a/testsuites/sptests/sp05/Makefile.am
+++ b/testsuites/sptests/sp05/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
 
-DOCS = sp05.scn sp05.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp05.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp05.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp05.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp05.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp05.scn: sp05.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp05.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp05.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp06/Makefile.am b/testsuites/sptests/sp06/Makefile.am
index 79fecb0c1a..7164858809 100644
--- a/testsuites/sptests/sp06/Makefile.am
+++ b/testsuites/sptests/sp06/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
 
-DOCS = sp06.scn sp06.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp06.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp06.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp06.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp06.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp06.scn: sp06.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp06.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp06.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp07/Makefile.am b/testsuites/sptests/sp07/Makefile.am
index f58f30e226..6e9707a2c9 100644
--- a/testsuites/sptests/sp07/Makefile.am
+++ b/testsuites/sptests/sp07/Makefile.am
@@ -2,54 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c buffered_io.c task1.c task2.c task3.c task4.c taskexit.c \
     tcreate.c tdelete.c trestart.c tstart.c system.h
 
-DOCS = sp07.scn sp07.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp07.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp07.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp07.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp07.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp07.scn: sp07.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp07.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp07.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp08/Makefile.am b/testsuites/sptests/sp08/Makefile.am
index a73afd5743..844895c669 100644
--- a/testsuites/sptests/sp08/Makefile.am
+++ b/testsuites/sptests/sp08/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = sp08.scn sp08.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp08.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp08.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp08.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp08.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp08.scn: sp08.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp08.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp08.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp09/Makefile.am b/testsuites/sptests/sp09/Makefile.am
index 0cba23a682..348c1d1d15 100644
--- a/testsuites/sptests/sp09/Makefile.am
+++ b/testsuites/sptests/sp09/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 MANAGERS = io message dual_ported_memory event multi_processor region \
     semaphore signal rate_monotonic timer partition
 
@@ -12,47 +11,27 @@ lib_a_SOURCES = init.c delay.c isr.c screen01.c screen02.c screen03.c screen04.c
     screen11.c screen12.c screen13.c screen14.c task1.c task2.c task3.c \
     task4.c system.h
 
-DOCS = sp09.scn sp09.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp09.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp09.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp09.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp09.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp09.scn: sp09.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp09.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp09.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp11/Makefile.am b/testsuites/sptests/sp11/Makefile.am
index 7cad772f99..b28792ebb6 100644
--- a/testsuites/sptests/sp11/Makefile.am
+++ b/testsuites/sptests/sp11/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c timer.c system.h
 
-DOCS = sp11.scn sp11.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp11.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp11.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp11.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp11.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp11.scn: sp11.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp11.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp11.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp12/Makefile.am b/testsuites/sptests/sp12/Makefile.am
index f0778d518b..be3071eecb 100644
--- a/testsuites/sptests/sp12/Makefile.am
+++ b/testsuites/sptests/sp12/Makefile.am
@@ -2,54 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c pridrv.c \
     pritask.c system.h
 
-DOCS = sp12.scn sp12.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp12.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp12.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp12.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp12.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp12.scn: sp12.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp12.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp12.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp13/Makefile.am b/testsuites/sptests/sp13/Makefile.am
index 27ab398d5a..c9c52ddd09 100644
--- a/testsuites/sptests/sp13/Makefile.am
+++ b/testsuites/sptests/sp13/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c fillbuff.c putbuff.c task1.c task2.c task3.c system.h
 
-DOCS = sp13.scn sp13.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp13.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp13.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp13.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp13.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp13.scn: sp13.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp13.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp13.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp14/Makefile.am b/testsuites/sptests/sp14/Makefile.am
index 0390d98729..aa56a3ab58 100644
--- a/testsuites/sptests/sp14/Makefile.am
+++ b/testsuites/sptests/sp14/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io signal timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c asr.c task1.c task2.c system.h
 
-DOCS = sp14.scn sp14.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp14.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp14.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp14.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp14.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp14.scn: sp14.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp14.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp14.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp15/Makefile.am b/testsuites/sptests/sp15/Makefile.am
index b6b186ae42..bc0c2181c7 100644
--- a/testsuites/sptests/sp15/Makefile.am
+++ b/testsuites/sptests/sp15/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io partition
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = sp15.scn sp15.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp15.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp15.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp15.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp15.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp15.scn: sp15.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp15.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp15.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp16/Makefile.am b/testsuites/sptests/sp16/Makefile.am
index 0bd80dee18..8ad6da940a 100644
--- a/testsuites/sptests/sp16/Makefile.am
+++ b/testsuites/sptests/sp16/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io region
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c system.h
 
-DOCS = sp16.scn sp16.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp16.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp16.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp16.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp16.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp16.scn: sp16.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp16.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp16.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp17/Makefile.am b/testsuites/sptests/sp17/Makefile.am
index efb92b4e89..cc7b07b542 100644
--- a/testsuites/sptests/sp17/Makefile.am
+++ b/testsuites/sptests/sp17/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io signal
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c asr.c task1.c task2.c system.h
 
-DOCS = sp17.scn sp17.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp17.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp17.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp17.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp17.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp17.scn: sp17.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp17.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp17.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp19/Makefile.am b/testsuites/sptests/sp19/Makefile.am
index 512a38c410..2898c9bd36 100644
--- a/testsuites/sptests/sp19/Makefile.am
+++ b/testsuites/sptests/sp19/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c first.c fptask.c task1.c system.h fptest.h inttest.h
 
-DOCS = sp19.scn sp19.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp19.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp19.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp19.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp19.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp19.scn: sp19.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp19.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp19.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp20/Makefile.am b/testsuites/sptests/sp20/Makefile.am
index cf32dab8f8..d836a55612 100644
--- a/testsuites/sptests/sp20/Makefile.am
+++ b/testsuites/sptests/sp20/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io rate_monotonic
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c getall.c task1.c system.h
 
-DOCS = sp20.scn sp20.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp20.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp20.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp20.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp20.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp20.scn: sp20.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp20.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp20.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp21/Makefile.am b/testsuites/sptests/sp21/Makefile.am
index 162afd1532..95fbc90602 100644
--- a/testsuites/sptests/sp21/Makefile.am
+++ b/testsuites/sptests/sp21/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = sp21.scn sp21.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp21.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp21.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp21.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp21.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp21.scn: sp21.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp21.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp21.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp22/Makefile.am b/testsuites/sptests/sp22/Makefile.am
index b3824a4e26..e4bdbd1f4d 100644
--- a/testsuites/sptests/sp22/Makefile.am
+++ b/testsuites/sptests/sp22/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c prtime.c delay.c task1.c system.h
 
-DOCS = sp22.scn sp22.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp22.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp22.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp22.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp22.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp22.scn: sp22.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp22.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp22.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp23/Makefile.am b/testsuites/sptests/sp23/Makefile.am
index 5f9a0bd60c..71c690f5fd 100644
--- a/testsuites/sptests/sp23/Makefile.am
+++ b/testsuites/sptests/sp23/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io dual_ported_memory
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = sp23.scn sp23.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp23.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp23.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp23.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp23.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp23.scn: sp23.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp23.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp23.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp24/Makefile.am b/testsuites/sptests/sp24/Makefile.am
index 855215714b..34317817c5 100644
--- a/testsuites/sptests/sp24/Makefile.am
+++ b/testsuites/sptests/sp24/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c resume.c task1.c system.h
 
-DOCS = sp24.scn sp24.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp24.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp24.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp24.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp24.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp24.scn: sp24.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp24.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp24.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp25/Makefile.am b/testsuites/sptests/sp25/Makefile.am
index e1c365b85f..00cda487c7 100644
--- a/testsuites/sptests/sp25/Makefile.am
+++ b/testsuites/sptests/sp25/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io region
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = sp25.scn sp25.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp25.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp25.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp25.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp25.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp25.scn: sp25.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp25.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp25.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp26/Makefile.am b/testsuites/sptests/sp26/Makefile.am
index 9a9495481c..9005f9a000 100644
--- a/testsuites/sptests/sp26/Makefile.am
+++ b/testsuites/sptests/sp26/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io region event
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = sp26.scn sp26.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp26.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp26.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp26.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp26.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp26.scn: sp26.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp26.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp26.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp27/Makefile.am b/testsuites/sptests/sp27/Makefile.am
index f48cce3fd5..a8cff9fd0f 100644
--- a/testsuites/sptests/sp27/Makefile.am
+++ b/testsuites/sptests/sp27/Makefile.am
@@ -2,51 +2,30 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS = sp27.doc sp27.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp27.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp27.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp27.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp27.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp27.scn: sp27.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp27.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp27.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp28/Makefile.am b/testsuites/sptests/sp28/Makefile.am
index 4b0300af86..a4d031ed18 100644
--- a/testsuites/sptests/sp28/Makefile.am
+++ b/testsuites/sptests/sp28/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS = sp28.doc sp28.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp28.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp28.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp28.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp28.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp28.scn: sp28.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp28.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp28.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp29/Makefile.am b/testsuites/sptests/sp29/Makefile.am
index ea4553c993..05fe7d3dfd 100644
--- a/testsuites/sptests/sp29/Makefile.am
+++ b/testsuites/sptests/sp29/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS = sp29.doc sp29.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp29.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp29.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp29.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp29.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp29.scn: sp29.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp29.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp29.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp30/Makefile.am b/testsuites/sptests/sp30/Makefile.am
index f9bfb33026..7cbcade495 100644
--- a/testsuites/sptests/sp30/Makefile.am
+++ b/testsuites/sptests/sp30/Makefile.am
@@ -2,13 +2,16 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c resume.c task1.c system.h
 
-DOCS = sp30.doc sp30.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp30.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp30.doc
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -18,36 +21,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp30.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp30.scn: sp30.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp30.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp30.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
+tests_SCRIPTS = $(PGM)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp31/Makefile.am b/testsuites/sptests/sp31/Makefile.am
index 3901207222..c05a372bd2 100644
--- a/testsuites/sptests/sp31/Makefile.am
+++ b/testsuites/sptests/sp31/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = delay.c init.c prtime.c task1.c system.h
 
-DOCS = sp31.doc sp31.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp31.scn
+docdir = $(testsdir)
+dist_doc_DATA = sp31.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp31.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp31.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp31.scn: sp31.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp31.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp31.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/sp32/Makefile.am b/testsuites/sptests/sp32/Makefile.am
index 95f30eaf73..0093ca847c 100644
--- a/testsuites/sptests/sp32/Makefile.am
+++ b/testsuites/sptests/sp32/Makefile.am
@@ -2,53 +2,30 @@
 ## $Id$
 ##
 
-
 MANAGERS = io rate_monotonic
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS = sp32.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = sp32.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/sp32.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/sp32.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/sp32.scn: sp32.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/sp32.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/sp32.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spfatal/Makefile.am b/testsuites/sptests/spfatal/Makefile.am
index 7b9975a278..ede696b68a 100644
--- a/testsuites/sptests/spfatal/Makefile.am
+++ b/testsuites/sptests/spfatal/Makefile.am
@@ -2,53 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c puterr.c fatal.c task1.c system.h
 
-DOCS = spfatal.scn spfatal.doc
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = spfatal.scn
+docdir = $(testsdir)
+dist_doc_DATA = spfatal.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/spfatal.exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/spfatal.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/spfatal.scn: spfatal.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/spfatal.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/spfatal.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
-
-EXTRA_DIST = $(DOCS)
+tests_SCRIPTS = $(PGM)
 
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/sptests/spsize/Makefile.am b/testsuites/sptests/spsize/Makefile.am
index e39972f174..ab312d059e 100644
--- a/testsuites/sptests/spsize/Makefile.am
+++ b/testsuites/sptests/spsize/Makefile.am
@@ -2,13 +2,14 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c getint.c size.c system.h
 
-DOCS = spsize.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = spsize.scn
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -18,36 +19,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-project_bspdir=$(PROJECT_ROOT)
-
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/tests/spsize.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/sptests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/sptests
-	@: > $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/sptests/spsize.scn: spsize.scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/spsize.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/spsize.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
-
-all-local: $(TMPINSTALL_FILES)
+tests_SCRIPTS = $(PGM)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am