Rework.

author: Ralf Corsepius <ralf.corsepius@rtems.org> 2005-11-11 14:33:33 +0000
committer: Ralf Corsepius <ralf.corsepius@rtems.org> 2005-11-11 14:33:33 +0000
commit: 3bb5d9449078c07fa99b593b78cdcc2165badcdd (patch)
tree: 0d87bee26600e537e7445d8ba7924e410f7f1b8c /testsuites
parent: 2005-11-11 Ralf Corsepius <ralf.corsepius@rtems.org> (diff)
download: rtems-3bb5d9449078c07fa99b593b78cdcc2165badcdd.tar.bz2
115 files changed, 771 insertions, 3075 deletions
diff --git a/testsuites/itrontests/itronhello/Makefile.am b/testsuites/itrontests/itronhello/Makefile.am
index 5a542f8daa..f00d66ebe5 100644
--- a/testsuites/itrontests/itronhello/Makefile.am
+++ b/testsuites/itrontests/itronhello/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = itronhello.doc itronhello.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itronhello.scn
+docdir = $(testsdir)
+dist_doc_DATA = itronhello.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/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/itronhello.scn: itronhello.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itronhello.exe \
-$(project_bspdir)/tests/screens/itrontests/itronhello.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/itrontests/itronmbf01/Makefile.am b/testsuites/itrontests/itronmbf01/Makefile.am
index 5691eba9a2..df8f999bd5 100644
--- a/testsuites/itrontests/itronmbf01/Makefile.am
+++ b/testsuites/itrontests/itronmbf01/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = itronmbf01.doc itronmbf01.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itronmbf01.scn
+docdir = $(testsdir)
+dist_doc_DATA = itronmbf01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/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/itronmbf01.scn: itronmbf01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itronmbf01.exe \
-$(project_bspdir)/tests/screens/itrontests/itronmbf01.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/itrontests/itronmbox01/Makefile.am b/testsuites/itrontests/itronmbox01/Makefile.am
index 6b0c1472f6..4e18e54046 100644
--- a/testsuites/itrontests/itronmbox01/Makefile.am
+++ b/testsuites/itrontests/itronmbox01/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = itronmbox01.doc itronmbox01.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itronmbox01.scn
+docdir = $(testsdir)
+dist_doc_DATA = itronmbox01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/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/itronmbox01.scn: itronmbox01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itronmbox01.exe \
-$(project_bspdir)/tests/screens/itrontests/itronmbox01.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/itrontests/itronsem01/Makefile.am b/testsuites/itrontests/itronsem01/Makefile.am
index 4d3271c1a0..21449bbdb2 100644
--- a/testsuites/itrontests/itronsem01/Makefile.am
+++ b/testsuites/itrontests/itronsem01/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = itronsem01.doc itronsem01.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itronsem01.scn
+docdir = $(testsdir)
+dist_doc_DATA = itronsem01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/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/itronsem01.scn: itronsem01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itronsem01.exe \
-$(project_bspdir)/tests/screens/itrontests/itronsem01.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/itrontests/itrontask01/Makefile.am b/testsuites/itrontests/itrontask01/Makefile.am
index 17647a886f..54d6817850 100644
--- a/testsuites/itrontests/itrontask01/Makefile.am
+++ b/testsuites/itrontests/itrontask01/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = itrontask01.doc itrontask01.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itrontask01.scn
+docdir = $(testsdir)
+dist_doc_DATA = itrontask01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/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/itrontask01.scn: itrontask01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itrontask01.exe \
-$(project_bspdir)/tests/screens/itrontests/itrontask01.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/itrontests/itrontask02/Makefile.am b/testsuites/itrontests/itrontask02/Makefile.am
index 78231e4020..866f30267d 100644
--- a/testsuites/itrontests/itrontask02/Makefile.am
+++ b/testsuites/itrontests/itrontask02/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c dormant.c system.h
 
-DOCS = itrontask02.doc itrontask02.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itrontask02.scn
+docdir = $(testsdir)
+dist_doc_DATA = itrontask02.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/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/itrontask02.scn: itrontask02.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itrontask02.exe \
-$(project_bspdir)/tests/screens/itrontests/itrontask02.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/itrontests/itrontask03/Makefile.am b/testsuites/itrontests/itrontask03/Makefile.am
index 9392540627..a1bb5a0349 100644
--- a/testsuites/itrontests/itrontask03/Makefile.am
+++ b/testsuites/itrontests/itrontask03/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c preempt.c task1.c task2.c task3.c system.h
 
-DOCS = itrontask03.doc itrontask03.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itrontask03.scn
+docdir = $(testsdir)
+dist_doc_DATA = itrontask03.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/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/itrontask03.scn: itrontask03.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itrontask03.exe \
-$(project_bspdir)/tests/screens/itrontests/itrontask03.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/itrontests/itrontask04/Makefile.am b/testsuites/itrontests/itrontask04/Makefile.am
index 54ad92fc56..9672582ba1 100644
--- a/testsuites/itrontests/itrontask04/Makefile.am
+++ b/testsuites/itrontests/itrontask04/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
 
-DOCS = itrontask04.doc itrontask04.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itrontask04.scn
+docdir = $(testsdir)
+dist_doc_DATA = itrontask04.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/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/itrontask04.scn: itrontask04.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itrontask04.exe \
-$(project_bspdir)/tests/screens/itrontests/itrontask04.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/itrontests/itrontime01/Makefile.am b/testsuites/itrontests/itrontime01/Makefile.am
index 99d820d892..9e51654861 100644
--- a/testsuites/itrontests/itrontime01/Makefile.am
+++ b/testsuites/itrontests/itrontime01/Makefile.am
@@ -9,48 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = itrontime01.doc itrontime01.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = itrontime01.scn
+docdir = $(testsdir)
+dist_doc_DATA = itrontime01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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/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/itrontime01.scn: itrontime01.scn $(project_bspdir)/tests/screens/itrontests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = \
-$(project_bspdir)/tests/itrontime01.exe \
-$(project_bspdir)/tests/screens/itrontests/itrontime01.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/libtests/cpuuse/Makefile.am b/testsuites/libtests/cpuuse/Makefile.am
index 44c961d609..76c1a131dc 100644
--- a/testsuites/libtests/cpuuse/Makefile.am
+++ b/testsuites/libtests/cpuuse/Makefile.am
@@ -2,46 +2,30 @@
 ## $Id$
 ##
 
-
 MANAGERS = io rate_monotonic
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
 
-DOCS = cpuuse.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = cpuuse.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/cpuuse.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/cpuuse.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/cpuuse.exe
-
 $(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/libtests/malloctest/Makefile.am b/testsuites/libtests/malloctest/Makefile.am
index 6dfa369e6e..e539b38d2a 100644
--- a/testsuites/libtests/malloctest/Makefile.am
+++ b/testsuites/libtests/malloctest/Makefile.am
@@ -2,46 +2,30 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c system.h
 
-DOCS = malloctest.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = malloctest.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/malloctest.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/malloctest.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/malloctest.exe
-
 $(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/libtests/monitor/Makefile.am b/testsuites/libtests/monitor/Makefile.am
index d7478ff1f0..a07f2d3e27 100644
--- a/testsuites/libtests/monitor/Makefile.am
+++ b/testsuites/libtests/monitor/Makefile.am
@@ -2,47 +2,29 @@
 ## $Id$
 ##
 
-
 MANAGERS = dpmem event io msg mp part region sem signal timer rate_monotonic \
     ext
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = monitor.scn
+testsdir = $(libdir)/tests
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/monitor.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/monitor.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/monitor.exe
-
 $(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/libtests/putenvtest/Makefile.am b/testsuites/libtests/putenvtest/Makefile.am
index eb6b667dd7..4d4a30114a 100644
--- a/testsuites/libtests/putenvtest/Makefile.am
+++ b/testsuites/libtests/putenvtest/Makefile.am
@@ -2,46 +2,28 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS =
+testsdir = $(libdir)/tests
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/putenvtest.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/putenvtest.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/putenvtest.exe
-
 $(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/libtests/rtems++/Makefile.am b/testsuites/libtests/rtems++/Makefile.am
index e4445ec057..6bd6a1299a 100644
--- a/testsuites/libtests/rtems++/Makefile.am
+++ b/testsuites/libtests/rtems++/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 MANAGERS = event io msg sem signal timer rate_monotonic
 
 if HAS_CXX
@@ -10,9 +9,11 @@ noinst_LIBRARIES = lib.a
 lib_a_SOURCES = Init.cc Task1.cc Task2.cc Task3.cc System.h
 endif
 
-DOCS = rtems++.scn rtems++.doc
-
-
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = rtems++.scn
+docdir = $(testsdir)
+dist_doc_DATA = rtems++.doc
 
 PGM = ${ARCH}/rtems++.exe
 
@@ -20,36 +21,16 @@ 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/rtems++.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/rtems++.exe
-
-$(PGM): ${ARCH}/$(dirstamp)
-
-
+if HAS_CXX
 LD_LIBS = -lrtems++
+AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-if HAS_CXX
+tests_SCRIPTS = $(PGM)
 
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
+$(PGM): ${ARCH}/$(dirstamp)
 
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-cxx-exe)
-
-all-local: $(TMPINSTALL_FILES)
-else
-all-local:
 endif
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/rtmonuse/Makefile.am b/testsuites/libtests/rtmonuse/Makefile.am
index 4fc8760431..54790d7e60 100644
--- a/testsuites/libtests/rtmonuse/Makefile.am
+++ b/testsuites/libtests/rtmonuse/Makefile.am
@@ -2,46 +2,30 @@
 ## $Id$
 ##
 
-
 MANAGERS = io rate_monotonic
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c getall.c task1.c system.h
 
-DOCS = rtmonuse.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = rtmonuse.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/rtmonuse.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/rtmonuse.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/rtmonuse.exe
-
 $(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/libtests/stackchk/Makefile.am b/testsuites/libtests/stackchk/Makefile.am
index 4d5a50ff5e..c7eb439a78 100644
--- a/testsuites/libtests/stackchk/Makefile.am
+++ b/testsuites/libtests/stackchk/Makefile.am
@@ -2,46 +2,30 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = blow.c init.c task1.c system.h
 
-DOCS = stackchk.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = stackchk.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/stackchk.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/stackchk.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/stackchk.exe
-
 $(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/libtests/termios/Makefile.am b/testsuites/libtests/termios/Makefile.am
index a6fe4905d7..31197d6826 100644
--- a/testsuites/libtests/termios/Makefile.am
+++ b/testsuites/libtests/termios/Makefile.am
@@ -2,46 +2,28 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS =
+testsdir = $(libdir)/tests
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/termios.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/termios.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/termios.exe
-
 $(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/psxtests/psx01/Makefile.am b/testsuites/psxtests/psx01/Makefile.am
index 14a400468d..8ae52652e7 100644
--- a/testsuites/psxtests/psx01/Makefile.am
+++ b/testsuites/psxtests/psx01/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-DOCS = psx01.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psx01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psx01.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/psx01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psx01.scn: psx01.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psx01.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx01.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psx02/Makefile.am b/testsuites/psxtests/psx02/Makefile.am
index 9a30041ff8..81f73c4776 100644
--- a/testsuites/psxtests/psx02/Makefile.am
+++ b/testsuites/psxtests/psx02/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-DOCS = psx02.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psx02.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psx02.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/psx02.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psx02.scn: psx02.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psx02.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx02.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psx03/Makefile.am b/testsuites/psxtests/psx03/Makefile.am
index 50b2422e2c..2829ec1f8c 100644
--- a/testsuites/psxtests/psx03/Makefile.am
+++ b/testsuites/psxtests/psx03/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-DOCS = psx03.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psx03.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psx03.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/psx03.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psx03.scn: psx03.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psx03.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx03.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psx04/Makefile.am b/testsuites/psxtests/psx04/Makefile.am
index 115f1d254d..aed2764356 100644
--- a/testsuites/psxtests/psx04/Makefile.am
+++ b/testsuites/psxtests/psx04/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
 
-DOCS = psx04.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psx04.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psx04.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/psx04.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psx04.scn: psx04.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psx04.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx04.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psx05/Makefile.am b/testsuites/psxtests/psx05/Makefile.am
index 22d25351fb..75fd488728 100644
--- a/testsuites/psxtests/psx05/Makefile.am
+++ b/testsuites/psxtests/psx05/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
 
-DOCS = psx05.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psx05.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psx05.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/psx05.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psx05.scn: psx05.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psx05.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx05.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psx06/Makefile.am b/testsuites/psxtests/psx06/Makefile.am
index 28b17351e7..2c1a376b14 100644
--- a/testsuites/psxtests/psx06/Makefile.am
+++ b/testsuites/psxtests/psx06/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c task2.c system.h ../include/pmacros.h
 
-DOCS = psx06.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psx06.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psx06.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/psx06.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psx06.scn: psx06.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psx06.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx06.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psx07/Makefile.am b/testsuites/psxtests/psx07/Makefile.am
index df667945ed..61a33fbb37 100644
--- a/testsuites/psxtests/psx07/Makefile.am
+++ b/testsuites/psxtests/psx07/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-DOCS = psx07.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psx07.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psx07.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/psx07.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psx07.scn: psx07.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psx07.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx07.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psx08/Makefile.am b/testsuites/psxtests/psx08/Makefile.am
index 4c424c9187..5a2d16533c 100644
--- a/testsuites/psxtests/psx08/Makefile.am
+++ b/testsuites/psxtests/psx08/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
 
-DOCS = psx08.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psx08.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psx08.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/psx08.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psx08.scn: psx08.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psx08.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx08.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psx09/Makefile.am b/testsuites/psxtests/psx09/Makefile.am
index 0aa2621336..32897b9f54 100644
--- a/testsuites/psxtests/psx09/Makefile.am
+++ b/testsuites/psxtests/psx09/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h ../include/pmacros.h
 
-DOCS = psx09.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psx09.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psx09.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/psx09.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psx09.scn: psx09.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psx09.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx09.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psx10/Makefile.am b/testsuites/psxtests/psx10/Makefile.am
index cd21edbe08..48a22ef5b3 100644
--- a/testsuites/psxtests/psx10/Makefile.am
+++ b/testsuites/psxtests/psx10/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
 
-DOCS = psx10.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psx10.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psx10.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/psx10.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psx10.scn: psx10.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psx10.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx10.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psx11/Makefile.am b/testsuites/psxtests/psx11/Makefile.am
index af36df8a80..e90abbe9a8 100644
--- a/testsuites/psxtests/psx11/Makefile.am
+++ b/testsuites/psxtests/psx11/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-DOCS = psx11.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psx11.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psx11.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/psx11.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psx11.scn: psx11.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psx11.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx11.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psx12/Makefile.am b/testsuites/psxtests/psx12/Makefile.am
index 4cf2a464b3..360cd916dc 100644
--- a/testsuites/psxtests/psx12/Makefile.am
+++ b/testsuites/psxtests/psx12/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c task.c system.h ../include/pmacros.h
 
-DOCS = psx12.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psx12.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psx12.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/psx12.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psx12.scn: psx12.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psx12.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx12.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psx13/Makefile.am b/testsuites/psxtests/psx13/Makefile.am
index 968b959926..cf215e755f 100644
--- a/testsuites/psxtests/psx13/Makefile.am
+++ b/testsuites/psxtests/psx13/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = main.c test.c ../include/pmacros.h
 
-DOCS = psx13.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psx13.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psx13.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/psx13.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psx13.scn: psx13.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psx13.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psx13.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psxcancel/Makefile.am b/testsuites/psxtests/psxcancel/Makefile.am
index 6b7b3efdef..9cb672f468 100644
--- a/testsuites/psxtests/psxcancel/Makefile.am
+++ b/testsuites/psxtests/psxcancel/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c ../include/pmacros.h
 
-DOCS = psxcancel.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psxcancel.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psxcancel.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/psxcancel.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psxcancel.scn: psxcancel.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psxcancel.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxcancel.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psxchroot01/Makefile.am b/testsuites/psxtests/psxchroot01/Makefile.am
index cc351e9bac..b046a166b7 100644
--- a/testsuites/psxtests/psxchroot01/Makefile.am
+++ b/testsuites/psxtests/psxchroot01/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = main.c test.c ../include/pmacros.h
 
-DOCS = psxchroot01.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psxchroot01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psxchroot01.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/psxchroot01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psxchroot01.scn: psxchroot01.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psxchroot01.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxchroot01.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psxfile01/Makefile.am b/testsuites/psxtests/psxfile01/Makefile.am
index 5d94b75607..ec2a15faee 100644
--- a/testsuites/psxtests/psxfile01/Makefile.am
+++ b/testsuites/psxtests/psxfile01/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = main.c test.c test_cat.c test_extend.c test_write.c ../include/pmacros.h
 
-DOCS = psxfile01.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psxfile01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psxfile01.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/psxfile01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psxfile01.scn: psxfile01.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psxfile01.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxfile01.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psxmount/Makefile.am b/testsuites/psxtests/psxmount/Makefile.am
index 41f94cbc61..941f077b02 100644
--- a/testsuites/psxtests/psxmount/Makefile.am
+++ b/testsuites/psxtests/psxmount/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = main.c test.c ../include/pmacros.h
 
-DOCS = psxmount.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psxmount.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psxmount.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/psxmount.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psxmount.scn: psxmount.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psxmount.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxmount.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psxmsgq01/Makefile.am b/testsuites/psxtests/psxmsgq01/Makefile.am
index e1d9fedfe5..63701d95a4 100644
--- a/testsuites/psxtests/psxmsgq01/Makefile.am
+++ b/testsuites/psxtests/psxmsgq01/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h ../include/pmacros.h
 
-DOCS = psxmsgq01.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psxmsgq01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psxmsgq01.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/psxmsgq01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psxmsgq01.scn: psxmsgq01.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psxmsgq01.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxmsgq01.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psxreaddir/Makefile.am b/testsuites/psxtests/psxreaddir/Makefile.am
index cc677f98cf..54ea43d016 100644
--- a/testsuites/psxtests/psxreaddir/Makefile.am
+++ b/testsuites/psxtests/psxreaddir/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = main.c test.c ../include/pmacros.h
 
-DOCS = psxreaddir.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psxreaddir.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psxreaddir.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/psxreaddir.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psxreaddir.scn: psxreaddir.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psxreaddir.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxreaddir.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psxsem01/Makefile.am b/testsuites/psxtests/psxsem01/Makefile.am
index 1cef336f6a..696d9b35a2 100644
--- a/testsuites/psxtests/psxsem01/Makefile.am
+++ b/testsuites/psxtests/psxsem01/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h ../include/pmacros.h
 
-DOCS = psxsem01.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psxsem01.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psxsem01.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/psxsem01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psxsem01.scn: psxsem01.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psxsem01.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxsem01.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psxstat/Makefile.am b/testsuites/psxtests/psxstat/Makefile.am
index 4960733f9b..2824cf4bde 100644
--- a/testsuites/psxtests/psxstat/Makefile.am
+++ b/testsuites/psxtests/psxstat/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = main.c test.c ../include/pmacros.h
 
-DOCS = psxstat.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psxstat.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psxstat.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/psxstat.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psxstat.scn: psxstat.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psxstat.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxstat.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/psxtests/psxtime/Makefile.am b/testsuites/psxtests/psxtime/Makefile.am
index 309f08970e..7db672bf86 100644
--- a/testsuites/psxtests/psxtime/Makefile.am
+++ b/testsuites/psxtests/psxtime/Makefile.am
@@ -2,54 +2,30 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = main.c test.c
 
-DOCS = psxtime.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psxtime.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psxtime.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/psxtime.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psxtime.scn: psxtime.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psxtime.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxtime.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/psxtests/psxtimer/Makefile.am b/testsuites/psxtests/psxtimer/Makefile.am
index c1089712f1..e5503720c3 100644
--- a/testsuites/psxtests/psxtimer/Makefile.am
+++ b/testsuites/psxtests/psxtimer/Makefile.am
@@ -2,56 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = psxtimer.c system.h ../include/pmacros.h
 
-DOCS = psxtimer.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = psxtimer.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/psxtimer.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/psxtimer.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/screens/psxtests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
-	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-
-$(project_bspdir)/tests/screens/psxtests/psxtimer.scn: psxtimer.scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/psxtimer.exe
-TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/psxtimer.scn
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/include
 
 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/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am
index e4f65cc687..71dfbf6111 100644
--- a/testsuites/samples/base_sp/Makefile.am
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -9,43 +9,23 @@ MANAGERS = io
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c apptask.c system.h
 
-DOCS = base_sp.doc base_sp.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = base_sp.scn
+docdir = $(testsdir)
+dist_doc_DATA = base_sp.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/base_sp.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/base_sp.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/base_sp.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/base_sp.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
+tests_SCRIPTS = $(PGM)
 
-all-local: $(TMPINSTALL_FILES)
-
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index 0e9b9c441a..ecab477989 100644
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -9,47 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c main.cc system.h
 
-DOCS = cdtest.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = cdtest.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/cdtest.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/cdtest.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/cdtest.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/cdtest.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
 # AM_CPPFLAGS += -DRTEMS_TEST_IO_STREAM
 
-
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-cxx-exe)
-
-all-local: $(TMPINSTALL_FILES)
+tests_SCRIPTS = $(PGM)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
+	$(make-cxx-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am
index 61f1d559fc..2f3e7579c9 100644
--- a/testsuites/samples/fileio/Makefile.am
+++ b/testsuites/samples/fileio/Makefile.am
@@ -2,52 +2,33 @@
 ##  Makefile.am,v 1.9 2002/08/11 05:18:59 ralf Exp
 ##
 
-PGM = ${ARCH}/fileio.exe
 
 MANAGERS = io message semaphore
 
 if LIBCHIP
+PGM = ${ARCH}/fileio.exe
+
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 OBJS = $(lib_a_OBJECTS)
-endif
 
-DOCS = fileio.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = fileio.doc
+endif
 
 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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/fileio.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/fileio.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/fileio.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/fileio.exe
 
+if LIBCHIP
 $(PGM): ${ARCH}/$(dirstamp)
 
+tests_SCRIPTS = $(PGM)
 
-if LIBCHIP
-all-local: $(TMPINSTALL_FILES)
-
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 endif
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index 6667f3c485..f10bd46fde 100644
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -9,43 +9,23 @@ MANAGERS = io
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = hello.doc hello.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = hello.scn
+docdir = $(testsdir)
+dist_doc_DATA = hello.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/hello.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/hello.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/hello.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/hello.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
+tests_SCRIPTS = $(PGM)
 
-all-local: $(TMPINSTALL_FILES)
-
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am
index b2d24fddec..3b18f6120a 100644
--- a/testsuites/samples/iostream/Makefile.am
+++ b/testsuites/samples/iostream/Makefile.am
@@ -9,43 +9,23 @@ MANAGERS = io
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.cc system.h
 
-DOCS = iostream.doc iostream.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = iostream.scn
+docdir = $(testsdir)
+dist_doc_DATA = iostream.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/iostream.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/iostream.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/iostream.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/iostream.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
+tests_SCRIPTS = $(PGM)
 
-all-local: $(TMPINSTALL_FILES)
-
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-cxx-exe)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am
index 985fe31946..471b33628a 100644
--- a/testsuites/samples/loopback/Makefile.am
+++ b/testsuites/samples/loopback/Makefile.am
@@ -9,43 +9,21 @@ MANAGERS = io event
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS = loopback.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = loopback.scn
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/loopback.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/loopback.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/loopback.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/loopback.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
+tests_SCRIPTS = $(PGM)
 
-all-local: $(TMPINSTALL_FILES)
-
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
index f2fd1c29e5..d9e2f52b52 100644
--- a/testsuites/samples/minimum/Makefile.am
+++ b/testsuites/samples/minimum/Makefile.am
@@ -9,44 +9,25 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCS = minimum.doc minimum.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = minimum.scn
+docdir = $(testsdir)
+dist_doc_DATA = minimum.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/minimum.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/minimum.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/minimum.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/minimum.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
-all-local: $(TMPINSTALL_FILES)
 # 	This test should not be executed
 
-${PGM}: $(OBJS) $(LINK_FILES)
-	$(make-exe)
+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/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index c735184a3a..3509d54348 100644
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -9,48 +9,27 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c paranoia.c system.h
 
-DOCS = paranoia.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = paranoia.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/paranoia.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/paranoia.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/paranoia.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/paranoia.exe
 
 $(PGM): ${ARCH}/$(dirstamp)
 
 #  -DCYGNUS   turns on more verbose msgs
-
 AM_CPPFLAGS += -DNOSIGNAL -DCYGNUS -DNOMAIN
 
 LD_LIBS = -lm
 
-all-local: $(TMPINSTALL_FILES)
+tests_SCRIPTS = $(PGM)
 
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am
index 4427d8f2ef..d7b37fd9e7 100644
--- a/testsuites/samples/pppd/Makefile.am
+++ b/testsuites/samples/pppd/Makefile.am
@@ -11,39 +11,19 @@ lib_a_SOURCES = init.c pppdapp.c netconfig.h system.h
 
 OBJS = $(lib_a_OBJECTS)
 
+testsdir = $(libdir)/tests
 
 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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/pppd.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/pppd.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/pppd.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/pppd.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 LD_LIBS = -lpppd
 
-all-local: $(TMPINSTALL_FILES)
+tests_SCRIPTS = $(PGM)
 
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
index 8777cf8b34..15ff8ad8d9 100644
--- a/testsuites/samples/ticker/Makefile.am
+++ b/testsuites/samples/ticker/Makefile.am
@@ -9,43 +9,23 @@ MANAGERS = io
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c tasks.c system.h
 
-DOCS = ticker.doc ticker.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = ticker.scn
+docdir = $(testsdir)
+dist_doc_DATA = ticker.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/ticker.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/ticker.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/ticker.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/ticker.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
+tests_SCRIPTS = $(PGM)
 
-all-local: $(TMPINSTALL_FILES)
-
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
index 49ed749801..98c4f47934 100644
--- a/testsuites/samples/unlimited/Makefile.am
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -9,43 +9,23 @@ MANAGERS = io event
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c test1.c test2.c test3.c system.h
 
-DOCS = unlimited.doc unlimited.scn
+testsdir = $(libdir)/tests
+scndir = $(testsdir)
+dist_scn_DATA = unlimited.scn
+docdir = $(testsdir)
+dist_doc_DATA = unlimited.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 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)/samples/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/samples
-	@: > $(project_bspdir)/samples/$(dirstamp)
-$(project_bspdir)/tests/$(dirstamp):
-	@$(mkdir_p) $(project_bspdir)/tests
-	@: > $(project_bspdir)/tests/$(dirstamp)
-
-$(project_bspdir)/samples/unlimited.exe: $(PGM) $(project_bspdir)/samples/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-$(project_bspdir)/tests/unlimited.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/unlimited.exe
-TMPINSTALL_FILES += $(project_bspdir)/samples/unlimited.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
+tests_SCRIPTS = $(PGM)
 
-all-local: $(TMPINSTALL_FILES)
-
-${PGM}: $(OBJS) $(LINK_FILES)
+$(PGM): $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
-EXTRA_DIST = $(DOCS)
-
-CLEANFILES = $(TMPINSTALL_FILES)
-
 include $(top_srcdir)/../automake/local.am
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
diff --git a/testsuites/tmitrontests/tmitronsem01/Makefile.am b/testsuites/tmitrontests/tmitronsem01/Makefile.am
index 6b1a4f1cd3..1dc25aafc9 100644
--- a/testsuites/tmitrontests/tmitronsem01/Makefile.am
+++ b/testsuites/tmitrontests/tmitronsem01/Makefile.am
@@ -2,48 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c system.h
 
-DOCS = tmitronsem01.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tmitronsem01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tmitronsem01.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/tmitronsem01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tmitronsem01.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 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/tmtests/tm01/Makefile.am b/testsuites/tmtests/tm01/Makefile.am
index fc4502ac02..9599774a52 100644
--- a/testsuites/tmtests/tm01/Makefile.am
+++ b/testsuites/tmtests/tm01/Makefile.am
@@ -2,48 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm01.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm01.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm01.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/tm01.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm01.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 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/tmtests/tm02/Makefile.am b/testsuites/tmtests/tm02/Makefile.am
index 02176344e7..bd9d132cc1 100644
--- a/testsuites/tmtests/tm02/Makefile.am
+++ b/testsuites/tmtests/tm02/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm02.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm02.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm02.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/tm02.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm02.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm03/Makefile.am b/testsuites/tmtests/tm03/Makefile.am
index df7afecc40..3edeb15fd3 100644
--- a/testsuites/tmtests/tm03/Makefile.am
+++ b/testsuites/tmtests/tm03/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm03.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm03.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm03.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/tm03.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm03.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm04/Makefile.am b/testsuites/tmtests/tm04/Makefile.am
index 0b931a1afe..604943a53c 100644
--- a/testsuites/tmtests/tm04/Makefile.am
+++ b/testsuites/tmtests/tm04/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm04.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm04.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm04.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/tm04.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm04.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm05/Makefile.am b/testsuites/tmtests/tm05/Makefile.am
index 713c1e6dc5..1e331b76c3 100644
--- a/testsuites/tmtests/tm05/Makefile.am
+++ b/testsuites/tmtests/tm05/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm05.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm05.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm05.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/tm05.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm05.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm06/Makefile.am b/testsuites/tmtests/tm06/Makefile.am
index 42e2724a67..7796047b94 100644
--- a/testsuites/tmtests/tm06/Makefile.am
+++ b/testsuites/tmtests/tm06/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm06.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm06.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm06.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/tm06.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm06.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm07/Makefile.am b/testsuites/tmtests/tm07/Makefile.am
index 6ef6baeeda..4a841a864b 100644
--- a/testsuites/tmtests/tm07/Makefile.am
+++ b/testsuites/tmtests/tm07/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm07.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm07.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm07.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/tm07.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm07.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm08/Makefile.am b/testsuites/tmtests/tm08/Makefile.am
index f3b41c5300..fb581bb144 100644
--- a/testsuites/tmtests/tm08/Makefile.am
+++ b/testsuites/tmtests/tm08/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm08.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm08.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm08.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/tm08.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm08.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm09/Makefile.am b/testsuites/tmtests/tm09/Makefile.am
index fac0facfef..08b5e7f46a 100644
--- a/testsuites/tmtests/tm09/Makefile.am
+++ b/testsuites/tmtests/tm09/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm09.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm09.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm09.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/tm09.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm09.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm10/Makefile.am b/testsuites/tmtests/tm10/Makefile.am
index fc5c8dcc08..f4ce1ad27c 100644
--- a/testsuites/tmtests/tm10/Makefile.am
+++ b/testsuites/tmtests/tm10/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm10.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm10.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm10.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/tm10.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm10.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm11/Makefile.am b/testsuites/tmtests/tm11/Makefile.am
index b115b70c6a..93a68b8985 100644
--- a/testsuites/tmtests/tm11/Makefile.am
+++ b/testsuites/tmtests/tm11/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm11.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm11.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm11.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/tm11.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm11.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm12/Makefile.am b/testsuites/tmtests/tm12/Makefile.am
index 1629c456ac..3487f236e3 100644
--- a/testsuites/tmtests/tm12/Makefile.am
+++ b/testsuites/tmtests/tm12/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm12.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm12.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm12.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/tm12.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm12.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm13/Makefile.am b/testsuites/tmtests/tm13/Makefile.am
index 98cc39e591..229003001c 100644
--- a/testsuites/tmtests/tm13/Makefile.am
+++ b/testsuites/tmtests/tm13/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm13.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm13.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm13.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/tm13.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm13.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm14/Makefile.am b/testsuites/tmtests/tm14/Makefile.am
index ad76c1623b..f6e4e94a15 100644
--- a/testsuites/tmtests/tm14/Makefile.am
+++ b/testsuites/tmtests/tm14/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm14.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm14.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm14.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/tm14.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm14.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm15/Makefile.am b/testsuites/tmtests/tm15/Makefile.am
index dd81b25e1d..d2c3bd3d99 100644
--- a/testsuites/tmtests/tm15/Makefile.am
+++ b/testsuites/tmtests/tm15/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io event
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm15.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm15.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm15.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/tm15.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm15.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm16/Makefile.am b/testsuites/tmtests/tm16/Makefile.am
index ed2360afca..d554d24c8b 100644
--- a/testsuites/tmtests/tm16/Makefile.am
+++ b/testsuites/tmtests/tm16/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io event
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm16.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm16.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm16.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/tm16.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm16.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm17/Makefile.am b/testsuites/tmtests/tm17/Makefile.am
index 08706fb44b..91968f5d33 100644
--- a/testsuites/tmtests/tm17/Makefile.am
+++ b/testsuites/tmtests/tm17/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm17.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm17.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm17.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/tm17.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm17.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm18/Makefile.am b/testsuites/tmtests/tm18/Makefile.am
index 43607ca5b0..f54d3a8500 100644
--- a/testsuites/tmtests/tm18/Makefile.am
+++ b/testsuites/tmtests/tm18/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm18.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm18.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm18.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/tm18.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm18.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm19/Makefile.am b/testsuites/tmtests/tm19/Makefile.am
index 2652f21af2..84d9f75a9d 100644
--- a/testsuites/tmtests/tm19/Makefile.am
+++ b/testsuites/tmtests/tm19/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io signal
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm19.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm19.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm19.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/tm19.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm19.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm20/Makefile.am b/testsuites/tmtests/tm20/Makefile.am
index 0e59cef75d..903d3bcf68 100644
--- a/testsuites/tmtests/tm20/Makefile.am
+++ b/testsuites/tmtests/tm20/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io partition region
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm20.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm20.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm20.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/tm20.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm20.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm21/Makefile.am b/testsuites/tmtests/tm21/Makefile.am
index 74a0d3b9a9..61db32aae1 100644
--- a/testsuites/tmtests/tm21/Makefile.am
+++ b/testsuites/tmtests/tm21/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io dpmem message partition region semaphore rate_monotonic timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm21.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm21.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm21.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/tm21.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm21.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm22/Makefile.am b/testsuites/tmtests/tm22/Makefile.am
index c4a81b004f..ee6ffee5f8 100644
--- a/testsuites/tmtests/tm22/Makefile.am
+++ b/testsuites/tmtests/tm22/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm22.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm22.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm22.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/tm22.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm22.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm23/Makefile.am b/testsuites/tmtests/tm23/Makefile.am
index 7e40d1a1d7..c8a28a77d6 100644
--- a/testsuites/tmtests/tm23/Makefile.am
+++ b/testsuites/tmtests/tm23/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io event timer
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm23.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm23.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm23.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/tm23.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm23.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm24/Makefile.am b/testsuites/tmtests/tm24/Makefile.am
index 004c810472..8df2cb56c7 100644
--- a/testsuites/tmtests/tm24/Makefile.am
+++ b/testsuites/tmtests/tm24/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm24.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm24.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm24.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/tm24.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm24.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm25/Makefile.am b/testsuites/tmtests/tm25/Makefile.am
index bdbdf69b24..3994640b43 100644
--- a/testsuites/tmtests/tm25/Makefile.am
+++ b/testsuites/tmtests/tm25/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm25.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm25.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm25.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/tm25.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm25.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm26/Makefile.am b/testsuites/tmtests/tm26/Makefile.am
index a887f59c68..f46fccda9f 100644
--- a/testsuites/tmtests/tm26/Makefile.am
+++ b/testsuites/tmtests/tm26/Makefile.am
@@ -2,48 +2,32 @@
 ## $Id$
 ##
 
-
 MANAGERS = io semaphore
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h fptest.h ../include/timesys.h ../include/timesys.h
 
-DOCS = tm26.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm26.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm26.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/tm26.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm26.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 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/tmtests/tm27/Makefile.am b/testsuites/tmtests/tm27/Makefile.am
index 34a6d42969..a689a80cb6 100644
--- a/testsuites/tmtests/tm27/Makefile.am
+++ b/testsuites/tmtests/tm27/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm27.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm27.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm27.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/tm27.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm27.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm28/Makefile.am b/testsuites/tmtests/tm28/Makefile.am
index 187f334441..0739a09159 100644
--- a/testsuites/tmtests/tm28/Makefile.am
+++ b/testsuites/tmtests/tm28/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io dpmem
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm28.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm28.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm28.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/tm28.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm28.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tm29/Makefile.am b/testsuites/tmtests/tm29/Makefile.am
index dd6fe7465c..0db3c9f492 100644
--- a/testsuites/tmtests/tm29/Makefile.am
+++ b/testsuites/tmtests/tm29/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io rate_monotonic
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tm29.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tm29.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tm29.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/tm29.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tm29.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tmck/Makefile.am b/testsuites/tmtests/tmck/Makefile.am
index b4734b8a59..d86420a74a 100644
--- a/testsuites/tmtests/tmck/Makefile.am
+++ b/testsuites/tmtests/tmck/Makefile.am
@@ -2,49 +2,33 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = task1.c system.h ../include/timesys.h
 
-DOCS = tmck.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tmck.doc
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/tmck.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/tmck.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tmck.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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/tmtests/tmoverhd/Makefile.am b/testsuites/tmtests/tmoverhd/Makefile.am
index 112b1c13e6..8d7e109120 100644
--- a/testsuites/tmtests/tmoverhd/Makefile.am
+++ b/testsuites/tmtests/tmoverhd/Makefile.am
@@ -2,13 +2,14 @@
 ## $Id$
 ##
 
-
 MANAGERS = io
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = testtask.c empty.c system.h dumrtems.h ../include/timesys.h
 
-DOCS = tmoverhd.doc
+testsdir = $(libdir)/tests
+docdir = $(testsdir)
+dist_doc_DATA = tmoverhd.doc
 
 OBJS = $(lib_a_OBJECTS)
 
@@ -18,32 +19,16 @@ 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/tmoverhd.exe: $(PGM) $(project_bspdir)/tests/$(dirstamp)
-	$(INSTALL_PROGRAM) $< $@
-
-TMPINSTALL_FILES = $(project_bspdir)/tests/tmoverhd.exe
-
 $(PGM): ${ARCH}/$(dirstamp)
 
-
 OPERATION_COUNT = @OPERATION_COUNT@
 AM_CPPFLAGS += -I$(top_srcdir)/include -DOPERATION_COUNT=$(OPERATION_COUNT)
 
 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
author	Ralf Corsepius <ralf.corsepius@rtems.org>	2005-11-11 14:33:33 +0000
committer	Ralf Corsepius <ralf.corsepius@rtems.org>	2005-11-11 14:33:33 +0000
commit	3bb5d9449078c07fa99b593b78cdcc2165badcdd (patch)
tree	0d87bee26600e537e7445d8ba7924e410f7f1b8c /testsuites
parent	2005-11-11 Ralf Corsepius <ralf.corsepius@rtems.org> (diff)
download	rtems-3bb5d9449078c07fa99b593b78cdcc2165badcdd.tar.bz2