Expand sptests.am.

32 files changed, 672 insertions, 32 deletions

diff --git a/testsuites/sptests/sp01/Makefile.am b/testsuites/sptests/sp01/Makefile.am
index 0cea74eac4..115824b70e 100644
--- a/testsuites/sptests/sp01/Makefile.am
+++ b/testsuites/sptests/sp01/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp02/Makefile.am b/testsuites/sptests/sp02/Makefile.am
index a025e84890..4f923fa325 100644
--- a/testsuites/sptests/sp02/Makefile.am
+++ b/testsuites/sptests/sp02/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp03/Makefile.am b/testsuites/sptests/sp03/Makefile.am
index a4252fcf8a..e3876b4734 100644
--- a/testsuites/sptests/sp03/Makefile.am
+++ b/testsuites/sptests/sp03/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp04/Makefile.am b/testsuites/sptests/sp04/Makefile.am
index 4624fa4405..8a4662f959 100644
--- a/testsuites/sptests/sp04/Makefile.am
+++ b/testsuites/sptests/sp04/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp05/Makefile.am b/testsuites/sptests/sp05/Makefile.am
index 035743d326..9df5b9e2fb 100644
--- a/testsuites/sptests/sp05/Makefile.am
+++ b/testsuites/sptests/sp05/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp06/Makefile.am b/testsuites/sptests/sp06/Makefile.am
index 39862e0944..b267bdded9 100644
--- a/testsuites/sptests/sp06/Makefile.am
+++ b/testsuites/sptests/sp06/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp07/Makefile.am b/testsuites/sptests/sp07/Makefile.am
index 1489e18aaa..18a77380ef 100644
--- a/testsuites/sptests/sp07/Makefile.am
+++ b/testsuites/sptests/sp07/Makefile.am
@@ -20,7 +20,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp08/Makefile.am b/testsuites/sptests/sp08/Makefile.am
index 25d1cbeaeb..d2c424b553 100644
--- a/testsuites/sptests/sp08/Makefile.am
+++ b/testsuites/sptests/sp08/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp09/Makefile.am b/testsuites/sptests/sp09/Makefile.am
index a82b1eb212..dea4737e4d 100644
--- a/testsuites/sptests/sp09/Makefile.am
+++ b/testsuites/sptests/sp09/Makefile.am
@@ -23,7 +23,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp11/Makefile.am b/testsuites/sptests/sp11/Makefile.am
index e697b6b623..53768a8c8f 100644
--- a/testsuites/sptests/sp11/Makefile.am
+++ b/testsuites/sptests/sp11/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp12/Makefile.am b/testsuites/sptests/sp12/Makefile.am
index ee037ba10e..d33177c1cb 100644
--- a/testsuites/sptests/sp12/Makefile.am
+++ b/testsuites/sptests/sp12/Makefile.am
@@ -20,7 +20,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp13/Makefile.am b/testsuites/sptests/sp13/Makefile.am
index abf215d334..127a2e0e21 100644
--- a/testsuites/sptests/sp13/Makefile.am
+++ b/testsuites/sptests/sp13/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp14/Makefile.am b/testsuites/sptests/sp14/Makefile.am
index f95c7e999c..1fa4fbf43c 100644
--- a/testsuites/sptests/sp14/Makefile.am
+++ b/testsuites/sptests/sp14/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp15/Makefile.am b/testsuites/sptests/sp15/Makefile.am
index 84abf760fc..539fbd0b91 100644
--- a/testsuites/sptests/sp15/Makefile.am
+++ b/testsuites/sptests/sp15/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp16/Makefile.am b/testsuites/sptests/sp16/Makefile.am
index c83d0be6e0..4ad64d3aa2 100644
--- a/testsuites/sptests/sp16/Makefile.am
+++ b/testsuites/sptests/sp16/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp17/Makefile.am b/testsuites/sptests/sp17/Makefile.am
index e7acdd61e2..1352864126 100644
--- a/testsuites/sptests/sp17/Makefile.am
+++ b/testsuites/sptests/sp17/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp19/Makefile.am b/testsuites/sptests/sp19/Makefile.am
index 6c6a38207d..cb124500ed 100644
--- a/testsuites/sptests/sp19/Makefile.am
+++ b/testsuites/sptests/sp19/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp20/Makefile.am b/testsuites/sptests/sp20/Makefile.am
index d0bff00533..bb4064afeb 100644
--- a/testsuites/sptests/sp20/Makefile.am
+++ b/testsuites/sptests/sp20/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp21/Makefile.am b/testsuites/sptests/sp21/Makefile.am
index 741f4fe741..2b4d5f13a6 100644
--- a/testsuites/sptests/sp21/Makefile.am
+++ b/testsuites/sptests/sp21/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp22/Makefile.am b/testsuites/sptests/sp22/Makefile.am
index b194bc2d80..216706e3ba 100644
--- a/testsuites/sptests/sp22/Makefile.am
+++ b/testsuites/sptests/sp22/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp23/Makefile.am b/testsuites/sptests/sp23/Makefile.am
index 7396284313..9ddfdb735c 100644
--- a/testsuites/sptests/sp23/Makefile.am
+++ b/testsuites/sptests/sp23/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp24/Makefile.am b/testsuites/sptests/sp24/Makefile.am
index d532d9e8a0..3be6a3316f 100644
--- a/testsuites/sptests/sp24/Makefile.am
+++ b/testsuites/sptests/sp24/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp25/Makefile.am b/testsuites/sptests/sp25/Makefile.am
index fe2062318e..25a5fc0a7e 100644
--- a/testsuites/sptests/sp25/Makefile.am
+++ b/testsuites/sptests/sp25/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp26/Makefile.am b/testsuites/sptests/sp26/Makefile.am
index 1d9e4e03a4..80a49094ec 100644
--- a/testsuites/sptests/sp26/Makefile.am
+++ b/testsuites/sptests/sp26/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp27/Makefile.am b/testsuites/sptests/sp27/Makefile.am
index e767377709..bc385e45fd 100644
--- a/testsuites/sptests/sp27/Makefile.am
+++ b/testsuites/sptests/sp27/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
diff --git a/testsuites/sptests/sp28/Makefile.am b/testsuites/sptests/sp28/Makefile.am
index fa1413e538..c58c819a5c 100644
--- a/testsuites/sptests/sp28/Makefile.am
+++ b/testsuites/sptests/sp28/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp29/Makefile.am b/testsuites/sptests/sp29/Makefile.am
index da9c49c0ae..3c36f8c12a 100644
--- a/testsuites/sptests/sp29/Makefile.am
+++ b/testsuites/sptests/sp29/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp30/Makefile.am b/testsuites/sptests/sp30/Makefile.am
index e721148ed3..621d6fab3c 100644
--- a/testsuites/sptests/sp30/Makefile.am
+++ b/testsuites/sptests/sp30/Makefile.am
@@ -18,7 +18,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp31/Makefile.am b/testsuites/sptests/sp31/Makefile.am
index aafbea4f05..4f74d379f7 100644
--- a/testsuites/sptests/sp31/Makefile.am
+++ b/testsuites/sptests/sp31/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/sp32/Makefile.am b/testsuites/sptests/sp32/Makefile.am
index 1e5d12a445..1c3208bd70 100644
--- a/testsuites/sptests/sp32/Makefile.am
+++ b/testsuites/sptests/sp32/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/spfatal/Makefile.am b/testsuites/sptests/spfatal/Makefile.am
index 43e6706b45..59817a5ff2 100644
--- a/testsuites/sptests/spfatal/Makefile.am
+++ b/testsuites/sptests/spfatal/Makefile.am
@@ -19,7 +19,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
diff --git a/testsuites/sptests/spsize/Makefile.am b/testsuites/sptests/spsize/Makefile.am
index 41fe4f3a05..e39c56ccf9 100644
--- a/testsuites/sptests/spsize/Makefile.am
+++ b/testsuites/sptests/spsize/Makefile.am
@@ -18,7 +18,27 @@ PGM = ${ARCH}/$(TEST).exe
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
-include $(top_srcdir)/sptests.am
+
+project_bspdir=$(PROJECT_ROOT)
+
+$(project_bspdir)/tests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests
+	@: > $(project_bspdir)/tests/$(dirstamp)
+
+$(project_bspdir)/tests/$(TEST).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/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/sptests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/sptests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include