Expand psxtests.am.

23 files changed, 483 insertions, 23 deletions

diff --git a/testsuites/psxtests/psx01/Makefile.am b/testsuites/psxtests/psx01/Makefile.am
index a245e7d1c8..25e50e57e5 100644
--- a/testsuites/psxtests/psx01/Makefile.am
+++ b/testsuites/psxtests/psx01/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psx02/Makefile.am b/testsuites/psxtests/psx02/Makefile.am
index 34f2272502..196400b2e9 100644
--- a/testsuites/psxtests/psx02/Makefile.am
+++ b/testsuites/psxtests/psx02/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psx03/Makefile.am b/testsuites/psxtests/psx03/Makefile.am
index 2eb4c9d410..4a8a1c72a7 100644
--- a/testsuites/psxtests/psx03/Makefile.am
+++ b/testsuites/psxtests/psx03/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psx04/Makefile.am b/testsuites/psxtests/psx04/Makefile.am
index 9ed1ac5148..312486bf76 100644
--- a/testsuites/psxtests/psx04/Makefile.am
+++ b/testsuites/psxtests/psx04/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psx05/Makefile.am b/testsuites/psxtests/psx05/Makefile.am
index 08b0e17766..6dc982840f 100644
--- a/testsuites/psxtests/psx05/Makefile.am
+++ b/testsuites/psxtests/psx05/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psx06/Makefile.am b/testsuites/psxtests/psx06/Makefile.am
index 5ccd45c13f..bec55c0519 100644
--- a/testsuites/psxtests/psx06/Makefile.am
+++ b/testsuites/psxtests/psx06/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psx07/Makefile.am b/testsuites/psxtests/psx07/Makefile.am
index 38aa6b17d3..f60da422a6 100644
--- a/testsuites/psxtests/psx07/Makefile.am
+++ b/testsuites/psxtests/psx07/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psx08/Makefile.am b/testsuites/psxtests/psx08/Makefile.am
index 7e280e518d..c5e65006c3 100644
--- a/testsuites/psxtests/psx08/Makefile.am
+++ b/testsuites/psxtests/psx08/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psx09/Makefile.am b/testsuites/psxtests/psx09/Makefile.am
index 980e6711e1..f508d7ed94 100644
--- a/testsuites/psxtests/psx09/Makefile.am
+++ b/testsuites/psxtests/psx09/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psx10/Makefile.am b/testsuites/psxtests/psx10/Makefile.am
index 1a70037454..12d0b50261 100644
--- a/testsuites/psxtests/psx10/Makefile.am
+++ b/testsuites/psxtests/psx10/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psx11/Makefile.am b/testsuites/psxtests/psx11/Makefile.am
index e94c9bcb17..f18ea917fe 100644
--- a/testsuites/psxtests/psx11/Makefile.am
+++ b/testsuites/psxtests/psx11/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psx12/Makefile.am b/testsuites/psxtests/psx12/Makefile.am
index 34bbe2bd41..4256d652b0 100644
--- a/testsuites/psxtests/psx12/Makefile.am
+++ b/testsuites/psxtests/psx12/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psx13/Makefile.am b/testsuites/psxtests/psx13/Makefile.am
index ebd4882b51..1c6370a3b5 100644
--- a/testsuites/psxtests/psx13/Makefile.am
+++ b/testsuites/psxtests/psx13/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psxcancel/Makefile.am b/testsuites/psxtests/psxcancel/Makefile.am
index 64853840fc..b11b674f58 100644
--- a/testsuites/psxtests/psxcancel/Makefile.am
+++ b/testsuites/psxtests/psxcancel/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psxchroot01/Makefile.am b/testsuites/psxtests/psxchroot01/Makefile.am
index 5f53af39a8..2d87844ae8 100644
--- a/testsuites/psxtests/psxchroot01/Makefile.am
+++ b/testsuites/psxtests/psxchroot01/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psxfile01/Makefile.am b/testsuites/psxtests/psxfile01/Makefile.am
index f38d4fef35..7e8b6137cd 100644
--- a/testsuites/psxtests/psxfile01/Makefile.am
+++ b/testsuites/psxtests/psxfile01/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psxmount/Makefile.am b/testsuites/psxtests/psxmount/Makefile.am
index 21269b3c5d..07d4b4b8ac 100644
--- a/testsuites/psxtests/psxmount/Makefile.am
+++ b/testsuites/psxtests/psxmount/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psxmsgq01/Makefile.am b/testsuites/psxtests/psxmsgq01/Makefile.am
index 69ae98aa0f..563bd4e53d 100644
--- a/testsuites/psxtests/psxmsgq01/Makefile.am
+++ b/testsuites/psxtests/psxmsgq01/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psxreaddir/Makefile.am b/testsuites/psxtests/psxreaddir/Makefile.am
index ee99087622..162cae0c45 100644
--- a/testsuites/psxtests/psxreaddir/Makefile.am
+++ b/testsuites/psxtests/psxreaddir/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psxsem01/Makefile.am b/testsuites/psxtests/psxsem01/Makefile.am
index 462b52b969..acb5fcb22b 100644
--- a/testsuites/psxtests/psxsem01/Makefile.am
+++ b/testsuites/psxtests/psxsem01/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psxstat/Makefile.am b/testsuites/psxtests/psxstat/Makefile.am
index 4f5583c68f..4ccceb1763 100644
--- a/testsuites/psxtests/psxstat/Makefile.am
+++ b/testsuites/psxtests/psxstat/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psxtime/Makefile.am b/testsuites/psxtests/psxtime/Makefile.am
index fd7c3aa693..06313eb3dd 100644
--- a/testsuites/psxtests/psxtime/Makefile.am
+++ b/testsuites/psxtests/psxtime/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=
diff --git a/testsuites/psxtests/psxtimer/Makefile.am b/testsuites/psxtests/psxtimer/Makefile.am
index 7bef1b7a63..7e20fa8ad1 100644
--- a/testsuites/psxtests/psxtimer/Makefile.am
+++ b/testsuites/psxtests/psxtimer/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)/psxtests.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/psxtests/$(dirstamp):
+	@$(mkdir_p) $(project_bspdir)/tests/screens/psxtests
+	@: > $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+
+$(project_bspdir)/tests/screens/psxtests/$(TEST).scn: $(TEST).scn $(project_bspdir)/tests/screens/psxtests/$(dirstamp)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES = $(project_bspdir)/tests/$(TEST).exe
+TMPINSTALL_FILES += $(project_bspdir)/tests/screens/psxtests/$(TEST).scn
+
+$(PGM): ${ARCH}/$(dirstamp)
 
 #
 # (OPTIONAL) Add local stuff here using +=