[PATCH 06/14] testsuite/psxtests: Merged nested Makefile.am files into one Makefile.am

Mon Apr 9 04:42:15 UTC 2018

This change is part of the testsuite Makefile.am reorganization.

Update #3382
---
 testsuites/psxtests/Makefile.am                    | 1315 ++++++++++++++++++--
 testsuites/psxtests/configure.ac                   |  212 ++--
 testsuites/psxtests/psx01/Makefile.am              |   22 -
 testsuites/psxtests/psx02/Makefile.am              |   22 -
 testsuites/psxtests/psx03/Makefile.am              |   22 -
 testsuites/psxtests/psx04/Makefile.am              |   22 -
 testsuites/psxtests/psx05/Makefile.am              |   22 -
 testsuites/psxtests/psx06/Makefile.am              |   22 -
 testsuites/psxtests/psx07/Makefile.am              |   23 -
 testsuites/psxtests/psx08/Makefile.am              |   22 -
 testsuites/psxtests/psx09/Makefile.am              |   22 -
 testsuites/psxtests/psx10/Makefile.am              |   22 -
 testsuites/psxtests/psx11/Makefile.am              |   22 -
 testsuites/psxtests/psx12/Makefile.am              |   22 -
 testsuites/psxtests/psx13/Makefile.am              |   22 -
 testsuites/psxtests/psx14/Makefile.am              |   22 -
 testsuites/psxtests/psx15/Makefile.am              |   22 -
 testsuites/psxtests/psx16/Makefile.am              |   22 -
 testsuites/psxtests/psxaio01/Makefile.am           |   22 -
 testsuites/psxtests/psxaio02/Makefile.am           |   22 -
 testsuites/psxtests/psxaio03/Makefile.am           |   22 -
 testsuites/psxtests/psxalarm01/Makefile.am         |   23 -
 testsuites/psxtests/psxautoinit01/Makefile.am      |   23 -
 testsuites/psxtests/psxautoinit02/Makefile.am      |   25 -
 testsuites/psxtests/psxbarrier01/Makefile.am       |   23 -
 testsuites/psxtests/psxcancel/Makefile.am          |   23 -
 testsuites/psxtests/psxcancel01/Makefile.am        |   23 -
 testsuites/psxtests/psxchroot01/Makefile.am        |   22 -
 testsuites/psxtests/psxclassic01/Makefile.am       |   23 -
 testsuites/psxtests/psxcleanup/Makefile.am         |   22 -
 testsuites/psxtests/psxcleanup01/Makefile.am       |   23 -
 testsuites/psxtests/psxcleanup02/Makefile.am       |   19 -
 testsuites/psxtests/psxclock/Makefile.am           |   23 -
 testsuites/psxtests/psxclock01/Makefile.am         |   21 -
 testsuites/psxtests/psxclockrealtime01/Makefile.am |   19 -
 testsuites/psxtests/psxconcurrency01/Makefile.am   |   23 -
 testsuites/psxtests/psxcond01/Makefile.am          |   24 -
 testsuites/psxtests/psxcond02/Makefile.am          |   24 -
 testsuites/psxtests/psxconfig01/Makefile.am        |   24 -
 testsuites/psxtests/psxdevctl01/Makefile.am        |   23 -
 testsuites/psxtests/psxeintr_join/Makefile.am      |   21 -
 testsuites/psxtests/psxenosys/Makefile.am          |   23 -
 testsuites/psxtests/psxfatal01/Makefile.am         |   21 -
 testsuites/psxtests/psxfatal02/Makefile.am         |   21 -
 testsuites/psxtests/psxfchx01/Makefile.am          |   23 -
 testsuites/psxtests/psxfile01/Makefile.am          |   20 -
 testsuites/psxtests/psxfile02/Makefile.am          |   21 -
 testsuites/psxtests/psxfilelock01/Makefile.am      |   21 -
 testsuites/psxtests/psxgetattrnp01/Makefile.am     |   23 -
 testsuites/psxtests/psxgetrusage01/Makefile.am     |   21 -
 testsuites/psxtests/psxglobalcon01/Makefile.am     |   19 -
 testsuites/psxtests/psxglobalcon02/Makefile.am     |   19 -
 testsuites/psxtests/psxhdrs/Makefile.am            |  182 ---
 testsuites/psxtests/psxid01/Makefile.am            |   21 -
 testsuites/psxtests/psximfs01/Makefile.am          |   21 -
 testsuites/psxtests/psximfs02/Makefile.am          |   20 -
 testsuites/psxtests/psxintrcritical01/Makefile.am  |   24 -
 testsuites/psxtests/psxitimer/Makefile.am          |   22 -
 testsuites/psxtests/psxkey01/Makefile.am           |   23 -
 testsuites/psxtests/psxkey02/Makefile.am           |   23 -
 testsuites/psxtests/psxkey03/Makefile.am           |   23 -
 testsuites/psxtests/psxkey04/Makefile.am           |   23 -
 testsuites/psxtests/psxkey05/Makefile.am           |   23 -
 testsuites/psxtests/psxkey06/Makefile.am           |   23 -
 testsuites/psxtests/psxkey07/Makefile.am           |   23 -
 testsuites/psxtests/psxkey08/Makefile.am           |   23 -
 testsuites/psxtests/psxkey09/Makefile.am           |   23 -
 testsuites/psxtests/psxkey10/Makefile.am           |   23 -
 testsuites/psxtests/psxmmap01/Makefile.am          |   22 -
 testsuites/psxtests/psxmount/Makefile.am           |   22 -
 testsuites/psxtests/psxmsgq01/Makefile.am          |   24 -
 testsuites/psxtests/psxmsgq02/Makefile.am          |   23 -
 testsuites/psxtests/psxmsgq03/Makefile.am          |   24 -
 testsuites/psxtests/psxmsgq04/Makefile.am          |   24 -
 testsuites/psxtests/psxmutexattr01/Makefile.am     |   23 -
 testsuites/psxtests/psxobj01/Makefile.am           |   23 -
 testsuites/psxtests/psxonce01/Makefile.am          |   22 -
 testsuites/psxtests/psxpasswd01/Makefile.am        |   23 -
 testsuites/psxtests/psxpasswd02/Makefile.am        |   23 -
 testsuites/psxtests/psxpipe01/Makefile.am          |   23 -
 testsuites/psxtests/psxrdwrv/Makefile.am           |   22 -
 testsuites/psxtests/psxreaddir/Makefile.am         |   22 -
 testsuites/psxtests/psxrwlock01/Makefile.am        |   23 -
 testsuites/psxtests/psxsem01/Makefile.am           |   23 -
 testsuites/psxtests/psxshm01/Makefile.am           |   22 -
 testsuites/psxtests/psxshm02/Makefile.am           |   22 -
 testsuites/psxtests/psxsignal01/Makefile.am        |   22 -
 testsuites/psxtests/psxsignal02/Makefile.am        |   23 -
 testsuites/psxtests/psxsignal03/Makefile.am        |   24 -
 testsuites/psxtests/psxsignal04/Makefile.am        |   24 -
 testsuites/psxtests/psxsignal05/Makefile.am        |   23 -
 testsuites/psxtests/psxsignal06/Makefile.am        |   21 -
 testsuites/psxtests/psxspin01/Makefile.am          |   23 -
 testsuites/psxtests/psxstack01/Makefile.am         |   23 -
 testsuites/psxtests/psxstack02/Makefile.am         |   21 -
 testsuites/psxtests/psxstat/Makefile.am            |   22 -
 testsuites/psxtests/psxstrsignal01/Makefile.am     |   24 -
 testsuites/psxtests/psxsysconf/Makefile.am         |   22 -
 testsuites/psxtests/psxthreadname01/Makefile.am    |   19 -
 testsuites/psxtests/psxtime/Makefile.am            |   21 -
 testsuites/psxtests/psxtimer01/Makefile.am         |   22 -
 testsuites/psxtests/psxtimer02/Makefile.am         |   22 -
 testsuites/psxtests/psxtimes01/Makefile.am         |   20 -
 testsuites/psxtests/psxualarm/Makefile.am          |   22 -
 testsuites/psxtests/psxusleep/Makefile.am          |   23 -
 105 files changed, 1294 insertions(+), 2686 deletions(-)
 delete mode 100644 testsuites/psxtests/psx01/Makefile.am
 delete mode 100644 testsuites/psxtests/psx02/Makefile.am
 delete mode 100644 testsuites/psxtests/psx03/Makefile.am
 delete mode 100644 testsuites/psxtests/psx04/Makefile.am
 delete mode 100644 testsuites/psxtests/psx05/Makefile.am
 delete mode 100644 testsuites/psxtests/psx06/Makefile.am
 delete mode 100644 testsuites/psxtests/psx07/Makefile.am
 delete mode 100644 testsuites/psxtests/psx08/Makefile.am
 delete mode 100644 testsuites/psxtests/psx09/Makefile.am
 delete mode 100644 testsuites/psxtests/psx10/Makefile.am
 delete mode 100644 testsuites/psxtests/psx11/Makefile.am
 delete mode 100644 testsuites/psxtests/psx12/Makefile.am
 delete mode 100644 testsuites/psxtests/psx13/Makefile.am
 delete mode 100644 testsuites/psxtests/psx14/Makefile.am
 delete mode 100644 testsuites/psxtests/psx15/Makefile.am
 delete mode 100644 testsuites/psxtests/psx16/Makefile.am
 delete mode 100644 testsuites/psxtests/psxaio01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxaio02/Makefile.am
 delete mode 100644 testsuites/psxtests/psxaio03/Makefile.am
 delete mode 100644 testsuites/psxtests/psxalarm01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxautoinit01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxautoinit02/Makefile.am
 delete mode 100644 testsuites/psxtests/psxbarrier01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxcancel/Makefile.am
 delete mode 100644 testsuites/psxtests/psxcancel01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxchroot01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxclassic01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxcleanup/Makefile.am
 delete mode 100644 testsuites/psxtests/psxcleanup01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxcleanup02/Makefile.am
 delete mode 100644 testsuites/psxtests/psxclock/Makefile.am
 delete mode 100644 testsuites/psxtests/psxclock01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxclockrealtime01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxconcurrency01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxcond01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxcond02/Makefile.am
 delete mode 100644 testsuites/psxtests/psxconfig01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxdevctl01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxeintr_join/Makefile.am
 delete mode 100644 testsuites/psxtests/psxenosys/Makefile.am
 delete mode 100644 testsuites/psxtests/psxfatal01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxfatal02/Makefile.am
 delete mode 100644 testsuites/psxtests/psxfchx01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxfile01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxfile02/Makefile.am
 delete mode 100644 testsuites/psxtests/psxfilelock01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxgetattrnp01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxgetrusage01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxglobalcon01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxglobalcon02/Makefile.am
 delete mode 100644 testsuites/psxtests/psxhdrs/Makefile.am
 delete mode 100644 testsuites/psxtests/psxid01/Makefile.am
 delete mode 100644 testsuites/psxtests/psximfs01/Makefile.am
 delete mode 100644 testsuites/psxtests/psximfs02/Makefile.am
 delete mode 100644 testsuites/psxtests/psxintrcritical01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxitimer/Makefile.am
 delete mode 100644 testsuites/psxtests/psxkey01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxkey02/Makefile.am
 delete mode 100644 testsuites/psxtests/psxkey03/Makefile.am
 delete mode 100644 testsuites/psxtests/psxkey04/Makefile.am
 delete mode 100644 testsuites/psxtests/psxkey05/Makefile.am
 delete mode 100644 testsuites/psxtests/psxkey06/Makefile.am
 delete mode 100644 testsuites/psxtests/psxkey07/Makefile.am
 delete mode 100644 testsuites/psxtests/psxkey08/Makefile.am
 delete mode 100644 testsuites/psxtests/psxkey09/Makefile.am
 delete mode 100644 testsuites/psxtests/psxkey10/Makefile.am
 delete mode 100644 testsuites/psxtests/psxmmap01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxmount/Makefile.am
 delete mode 100644 testsuites/psxtests/psxmsgq01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxmsgq02/Makefile.am
 delete mode 100644 testsuites/psxtests/psxmsgq03/Makefile.am
 delete mode 100644 testsuites/psxtests/psxmsgq04/Makefile.am
 delete mode 100644 testsuites/psxtests/psxmutexattr01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxobj01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxonce01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxpasswd01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxpasswd02/Makefile.am
 delete mode 100644 testsuites/psxtests/psxpipe01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxrdwrv/Makefile.am
 delete mode 100644 testsuites/psxtests/psxreaddir/Makefile.am
 delete mode 100644 testsuites/psxtests/psxrwlock01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxsem01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxshm01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxshm02/Makefile.am
 delete mode 100644 testsuites/psxtests/psxsignal01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxsignal02/Makefile.am
 delete mode 100644 testsuites/psxtests/psxsignal03/Makefile.am
 delete mode 100644 testsuites/psxtests/psxsignal04/Makefile.am
 delete mode 100644 testsuites/psxtests/psxsignal05/Makefile.am
 delete mode 100644 testsuites/psxtests/psxsignal06/Makefile.am
 delete mode 100644 testsuites/psxtests/psxspin01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxstack01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxstack02/Makefile.am
 delete mode 100644 testsuites/psxtests/psxstat/Makefile.am
 delete mode 100644 testsuites/psxtests/psxstrsignal01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxsysconf/Makefile.am
 delete mode 100644 testsuites/psxtests/psxthreadname01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxtime/Makefile.am
 delete mode 100644 testsuites/psxtests/psxtimer01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxtimer02/Makefile.am
 delete mode 100644 testsuites/psxtests/psxtimes01/Makefile.am
 delete mode 100644 testsuites/psxtests/psxualarm/Makefile.am
 delete mode 100644 testsuites/psxtests/psxusleep/Makefile.am

diff --git a/testsuites/psxtests/Makefile.am b/testsuites/psxtests/Makefile.am
index 2a74470d60..2a18d54af7 100644
--- a/testsuites/psxtests/Makefile.am
+++ b/testsuites/psxtests/Makefile.am
@@ -1,133 +1,1194 @@
+#
+# POSIX Teststuite
+#
+
 ACLOCAL_AMFLAGS = -I ../aclocal
 
-## Some of the tests need other POSIX features to work while some do not.
-
-_SUBDIRS  =
-if HAS_POSIX
-_SUBDIRS += psx01
-_SUBDIRS += psx02
-_SUBDIRS += psx03
-_SUBDIRS += psx04
-_SUBDIRS += psx05
-_SUBDIRS += psx06
-_SUBDIRS += psx07
-_SUBDIRS += psx08
-_SUBDIRS += psx09
-_SUBDIRS += psx10
-_SUBDIRS += psx11
-_SUBDIRS += psx12
-_SUBDIRS += psx14
-_SUBDIRS += psx15
-_SUBDIRS += psx16
-_SUBDIRS += psxaio01
-_SUBDIRS += psxaio02
-_SUBDIRS += psxaio03
-_SUBDIRS += psxalarm01
-_SUBDIRS += psxautoinit01
-_SUBDIRS += psxautoinit02
-_SUBDIRS += psxbarrier01
-_SUBDIRS += psxcancel
-_SUBDIRS += psxcancel01
-_SUBDIRS += psxclassic01
-_SUBDIRS += psxcleanup
-_SUBDIRS += psxcleanup01
-_SUBDIRS += psxcleanup02
-endif
-_SUBDIRS += psxclock
-if HAS_POSIX
-_SUBDIRS += psxclock01
-_SUBDIRS += psxclockrealtime01
-_SUBDIRS += psxconcurrency01
-_SUBDIRS += psxcond01
-_SUBDIRS += psxcond02
-_SUBDIRS += psxconfig01
-endif
-_SUBDIRS += psxdevctl01
-if HAS_POSIX
-_SUBDIRS += psxeintr_join
-_SUBDIRS += psxenosys
-_SUBDIRS += psxfatal01
-_SUBDIRS += psxfatal02
-_SUBDIRS += psxgetattrnp01
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
+include $(top_srcdir)/../automake/compile.am
+
+psx_tests =
+psx_screens =
+psx_docs =
+psx_lib =
+
+support_includes = -I$(top_srcdir)/../support/include
+
+if HAS_POSIX
+if TEST_psx01
+psx_tests += psx01
+psx01_SOURCES = psx01/init.c psx01/task.c psx01/system.h \
+	include/pmacros.h
+psx01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psx02
+psx_tests += psx02
+psx_screens += psx02/psx02.scn
+psx02_SOURCES = psx02/init.c psx02/task.c psx02/system.h \
+	include/pmacros.h
+psx02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx02) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psx03
+psx_tests += psx03
+psx_screens += psx03/psx03.scn
+psx03_SOURCES = psx03/init.c psx03/task.c psx03/system.h \
+	include/pmacros.h
+psx03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx03) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psx04
+psx_tests += psx04
+psx_screens += psx04/psx04.scn
+psx04_SOURCES = psx04/init.c psx04/task1.c psx04/task2.c psx04/task3.c \
+	psx04/system.h include/pmacros.h
+psx04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx04) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psx05
+psx_tests += psx05
+psx_screens += psx05/psx05.scn
+psx05_SOURCES = psx05/init.c psx05/task.c psx05/task2.c psx05/task3.c \
+	psx05/system.h include/pmacros.h
+psx05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx05) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psx06
+psx_tests += psx06
+psx_screens += psx06/psx06.scn
+psx06_SOURCES = psx06/init.c psx06/task.c psx06/task2.c psx06/system.h \
+	include/pmacros.h
+psx06_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx06) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psx07
+psx_tests += psx07
+psx_screens += psx07/psx07.scn
+psx_docs += psx07/psx07.doc
+psx07_SOURCES = psx07/init.c psx07/task.c psx07/system.h \
+	include/pmacros.h
+psx07_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx07) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psx08
+psx_tests += psx08
+psx_screens += psx08/psx08.scn
+psx08_SOURCES = psx08/init.c psx08/task1.c psx08/task2.c psx08/task3.c \
+	psx08/system.h include/pmacros.h
+psx08_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx08) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psx09
+psx_tests += psx09
+psx_screens += psx09/psx09.scn
+psx09_SOURCES = psx09/init.c psx09/system.h include/pmacros.h
+psx09_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx09) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psx10
+psx_tests += psx10
+psx_screens += psx10/psx10.scn
+psx10_SOURCES = psx10/init.c psx10/task.c psx10/task2.c psx10/task3.c \
+	psx10/system.h include/pmacros.h
+psx10_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx10) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psx11
+psx_tests += psx11
+psx_screens += psx11/psx11.scn
+psx11_SOURCES = psx11/init.c psx11/task.c psx11/system.h \
+	include/pmacros.h
+psx11_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx11) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psx12
+psx_tests += psx12
+psx_screens += psx12/psx12.scn
+psx12_SOURCES = psx12/init.c include/pmacros.h
+psx12_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx12) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if TEST_psx13
+psx_tests += psx13
+psx_screens += psx13/psx13.scn
+psx13_SOURCES = psx13/main.c psx13/test.c include/pmacros.h
+psx13_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx13) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if HAS_POSIX
+if TEST_psx14
+psx_tests += psx14
+psx_screens += psx14/psx14.scn
+psx14_SOURCES = psx14/init.c psx14/system.h include/pmacros.h
+psx14_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx14) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psx15
+psx_tests += psx15
+psx_screens += psx15/psx15.scn
+psx15_SOURCES = psx15/init.c include/pmacros.h
+psx15_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx15) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psx16
+psx_tests += psx16
+psx_screens += psx16/psx16.scn
+psx16_SOURCES = psx16/init.c include/pmacros.h
+psx16_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psx16) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxaio01
+psx_tests += psxaio01
+psx_screens += psxaio01/psxaio01.scn
+psxaio01_SOURCES = psxaio01/init.c psxaio01/system.h include/pmacros.h
+psxaio01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxaio01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxaio02
+psx_tests += psxaio02
+psx_screens += psxaio02/psxaio02.scn
+psxaio02_SOURCES = psxaio02/init.c psxaio02/system.h include/pmacros.h
+psxaio02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxaio02) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxaio03
+psx_tests += psxaio03
+psx_screens += psxaio03/psxaio03.scn
+psxaio03_SOURCES = psxaio03/init.c psxaio03/system.h include/pmacros.h
+psxaio03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxaio03) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxalarm01
+psx_tests += psxalarm01
+psx_screens += psxalarm01/psxalarm01.scn
+psx_docs += psxalarm01/psxalarm01.doc
+psxalarm01_SOURCES = psxalarm01/init.c include/pmacros.h
+psxalarm01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxalarm01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxautoinit01
+psx_tests += psxautoinit01
+psx_screens += psxautoinit01/psxautoinit01.scn
+psxautoinit01_SOURCES = psxautoinit01/init.c include/pmacros.h
+psxautoinit01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxautoinit01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxautoinit02
+psx_tests += psxautoinit02
+psx_screens += psxautoinit02/psxautoinit02.scn
+psx_docs += psxautoinit02/psxautoinit02.doc
+psxautoinit02_SOURCES = psxautoinit02/init.c include/pmacros.h
+psxautoinit02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxautoinit02) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxbarrier01
+psx_tests += psxbarrier01
+psx_screens += psxbarrier01/psxbarrier01.scn
+psxbarrier01_SOURCES = psxbarrier01/main.c psxbarrier01/test.c \
+	include/pmacros.h
+psxbarrier01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxbarrier01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxcancel
+psx_tests += psxcancel
+psx_screens += psxcancel/psxcancel.scn
+psx_docs += psxcancel/psxcancel.doc
+psxcancel_SOURCES = psxcancel/init.c include/pmacros.h
+psxcancel_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxcancel) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxcancel01
+psx_tests += psxcancel01
+psx_screens += psxcancel01/psxcancel01.scn
+psx_docs += psxcancel01/psxcancel01.doc
+psxcancel01_SOURCES = psxcancel01/init.c include/pmacros.h
+psxcancel01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxcancel01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if TEST_psxchroot01
+psx_tests += psxchroot01
+psx_screens += psxchroot01/psxchroot01.scn
+psxchroot01_SOURCES = psxchroot01/main.c psxchroot01/test.c \
+	include/pmacros.h
+psxchroot01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxchroot01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if HAS_POSIX
+if TEST_psxclassic01
+psx_tests += psxclassic01
+psx_screens += psxclassic01/psxclassic01.scn
+psx_docs += psxclassic01/psxclassic01.doc
+psxclassic01_SOURCES = psxclassic01/init.c include/pmacros.h
+psxclassic01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxclassic01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxcleanup
+psx_tests += psxcleanup
+psx_screens += psxcleanup/psxcleanup.scn
+psxcleanup_SOURCES = psxcleanup/psxcleanup.c psxcleanup/system.h \
+	include/pmacros.h
+psxcleanup_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxcleanup) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxcleanup01
+psx_tests += psxcleanup01
+psx_screens += psxcleanup01/psxcleanup01.scn
+psx_docs += psxcleanup01/psxcleanup01.doc
+psxcleanup01_SOURCES = psxcleanup01/init.c include/pmacros.h
+psxcleanup01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxcleanup01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxcleanup02
+psx_tests += psxcleanup02
+psx_screens += psxcleanup02/psxcleanup02.scn
+psx_docs += psxcleanup02/psxcleanup02.doc
+psxcleanup02_SOURCES = psxcleanup02/init.c psxcleanup02/main.c
+psxcleanup02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxcleanup02) \
+	$(support_includes)
+endif
+endif
+
+if TEST_psxclock
+psx_tests += psxclock
+psx_screens += psxclock/psxclock.scn
+psx_docs += psxclock/psxclock.doc
+psxclock_SOURCES = psxclock/init.c include/pmacros.h
+psxclock_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxclock) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if HAS_POSIX
+if TEST_psxclock01
+psx_tests += psxclock01
+psx_screens += psxclock01/psxclock01.scn
+psx_docs += psxclock01/psxclock01.doc
+psxclock01_SOURCES = psxclock01/init.c
+psxclock01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxclock01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxclockrealtime01
+psx_tests += psxclockrealtime01
+psx_screens += psxclockrealtime01/psxclockrealtime01.scn
+psx_docs += psxclockrealtime01/psxclockrealtime01.doc
+psxclockrealtime01_SOURCES = psxclockrealtime01/init.c
+psxclockrealtime01_CPPFLAGS = $(AM_CPPFLAGS) \
+	$(TEST_FLAGS_psxclockrealtime01) $(support_includes)
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxconcurrency01
+psx_tests += psxconcurrency01
+psx_screens += psxconcurrency01/psxconcurrency01.scn
+psx_docs += psxconcurrency01/psxconcurrency01.doc
+psxconcurrency01_SOURCES = psxconcurrency01/init.c include/pmacros.h
+psxconcurrency01_CPPFLAGS = $(AM_CPPFLAGS) \
+	$(TEST_FLAGS_psxconcurrency01) $(support_includes) \
+	-I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxcond01
+psx_tests += psxcond01
+psx_screens += psxcond01/psxcond01.scn
+psx_docs += psxcond01/psxcond01.doc
+psxcond01_SOURCES = psxcond01/init.c include/pmacros.h
+psxcond01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxcond01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxcond02
+psx_tests += psxcond02
+psx_screens += psxcond02/psxcond02.scn
+psx_docs += psxcond02/psxcond02.doc
+psxcond02_SOURCES = psxcond02/init.c include/pmacros.h
+psxcond02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxcond02) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxconfig01
+psx_tests += psxconfig01
+psx_screens += psxconfig01/psxconfig01.scn
+psx_docs += psxconfig01/psxconfig01.doc
+psxconfig01_SOURCES = psxconfig01/init.c include/pmacros.h
+psxconfig01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxconfig01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if TEST_psxdevctl01
+psx_tests += psxdevctl01
+psx_screens += psxdevctl01/psxdevctl01.scn
+psxdevctl01_SOURCES = psxdevctl01/main.c psxdevctl01/test.c \
+	include/pmacros.h
+psxdevctl01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxdevctl01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if HAS_POSIX
+if TEST_psxeintr_join
+psx_tests += psxeintr_join
+psx_screens += psxeintr_join/psxeintr_join.scn
+psx_docs += psxeintr_join/psxeintr_join.doc
+psxeintr_join_SOURCES = psxeintr_join/init.c
+psxeintr_join_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxeintr_join) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxenosys
+psx_tests += psxenosys
+psx_screens += psxenosys/psxenosys.scn
+psx_docs += psxenosys/psxenosys.doc
+psxenosys_SOURCES = psxenosys/init.c psxenosys/system.h \
+	include/pmacros.h
+psxenosys_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxenosys) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxfatal01
+psx_tests += psxfatal01
+psx_screens += psxfatal01/psxfatal01.scn
+psxfatal01_SOURCES = psxfatal_support/init.c psxfatal_support/system.h \
+	psxfatal01/testcase.h
+psxfatal01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxfatal01) \
+	$(support_includes) -I$(top_srcdir)/psxfatal01
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxfatal02
+psx_tests += psxfatal02
+psx_screens += psxfatal02/psxfatal02.scn
+psxfatal02_SOURCES = psxfatal_support/init.c psxfatal_support/system.h \
+	psxfatal02/testcase.h
+psxfatal02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxfatal02) \
+	$(support_includes) -I$(top_srcdir)/psxfatal02
+endif
+endif
+
+if TEST_psxfchx01
+psx_tests += psxfchx01
+psx_screens += psxfchx01/psxfchx01.scn
+psx_docs += psxfchx01/psxfchx01.doc
+psxfchx01_SOURCES = psxfchx01/init.c include/pmacros.h
+psxfchx01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxfchx01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_psxfile01
+psx_tests += psxfile01
+psx_screens += psxfile01/psxfile01.scn
+psxfile01_SOURCES = psxfile01/main.c psxfile01/test.c \
+	psxfile01/test_cat.c psxfile01/test_extend.c psxfile01/test_write.c \
+	include/pmacros.h
+psxfile01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxfile01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_psxfile02
+psx_tests += psxfile02
+psx_screens += psxfile02/psxfile02.scn
+psx_docs += psxfile02/psxfile02.doc
+psxfile02_SOURCES = psxfile02/init.c ../support/src/spin.c
+psxfile02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxfile02) \
+	$(support_includes)
+endif
+
+if TEST_psxfilelock01
+psx_tests += psxfilelock01
+psx_screens += psxfilelock01/psxfilelock01.scn
+psx_docs += psxfilelock01/psxfilelock01.doc
+psxfilelock01_SOURCES = psxfilelock01/init.c
+psxfilelock01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxfilelock01) \
+	$(support_includes)
+endif
+
+if HAS_POSIX
+if TEST_psxgetattrnp01
+psx_tests += psxgetattrnp01
+psx_screens += psxgetattrnp01/psxgetattrnp01.scn
+psx_docs += psxgetattrnp01/psxgetattrnp01.doc
+psxgetattrnp01_SOURCES = psxgetattrnp01/init.c
+psxgetattrnp01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxgetattrnp01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if TEST_psxgetrusage01
+psx_tests += psxgetrusage01
+psx_screens += psxgetrusage01/psxgetrusage01.scn
+psx_docs += psxgetrusage01/psxgetrusage01.doc
+psxgetrusage01_SOURCES = psxgetrusage01/init.c ../support/src/spin.c
+psxgetrusage01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxgetrusage01) \
+	$(support_includes)
+endif
+
+if HAS_POSIX
+if HAS_CPLUSPLUS
+if TEST_psxglobalcon01
+psx_tests += psxglobalcon01
+psx_screens += psxglobalcon01/psxglobalcon01.scn
+psx_docs += psxglobalcon01/psxglobalcon01.doc
+psxglobalcon01_SOURCES = psxglobalcon01/init.cc
+psxglobalcon01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxglobalcon01) \
+	$(support_includes)
+endif
+endif
 endif
+
 if HAS_POSIX
 if HAS_CPLUSPLUS
-_SUBDIRS += psxglobalcon01
-_SUBDIRS += psxglobalcon02
-endif
-_SUBDIRS += psxhdrs
-_SUBDIRS += psxintrcritical01
-_SUBDIRS += psxitimer
-endif
-_SUBDIRS += psxkey01
-_SUBDIRS += psxkey02
-_SUBDIRS += psxkey03
-_SUBDIRS += psxkey04
-_SUBDIRS += psxkey05
-_SUBDIRS += psxkey06
-if HAS_POSIX
-_SUBDIRS += psxkey07
-endif
-_SUBDIRS += psxkey08
-_SUBDIRS += psxkey09
-_SUBDIRS += psxkey10
-if HAS_POSIX
-_SUBDIRS += psxmsgq01
-_SUBDIRS += psxmsgq02
-_SUBDIRS += psxmsgq03
-_SUBDIRS += psxmsgq04
-_SUBDIRS += psxmutexattr01
-_SUBDIRS += psxobj01
-endif
-_SUBDIRS += psxonce01
-_SUBDIRS += psxrdwrv
-if HAS_POSIX
-_SUBDIRS += psxrwlock01
-_SUBDIRS += psxsem01
-_SUBDIRS += psxshm01
-_SUBDIRS += psxshm02
-_SUBDIRS += psxmmap01
-_SUBDIRS += psxsignal01
-_SUBDIRS += psxsignal02
-_SUBDIRS += psxsignal03
-_SUBDIRS += psxsignal04
-_SUBDIRS += psxsignal05
-_SUBDIRS += psxsignal06
-_SUBDIRS += psxspin01
-_SUBDIRS += psxstack01
-_SUBDIRS += psxstack02
-_SUBDIRS += psxstrsignal01
-_SUBDIRS += psxsysconf
-endif
-if HAS_POSIX
-_SUBDIRS += psxthreadname01
-_SUBDIRS += psxtime
-_SUBDIRS += psxtimer01
-_SUBDIRS += psxtimer02
-_SUBDIRS += psxualarm
-_SUBDIRS += psxusleep
-endif
-
-
-
-## File IO tests
-_SUBDIRS += psx13
-_SUBDIRS += psxchroot01
-_SUBDIRS += psxfile01
-_SUBDIRS += psxfile02
-_SUBDIRS += psxfilelock01
-_SUBDIRS += psxgetrusage01
-_SUBDIRS += psxid01
-_SUBDIRS += psximfs01
-_SUBDIRS += psximfs02
-_SUBDIRS += psxmount
-_SUBDIRS += psxpasswd01
-_SUBDIRS += psxpasswd02
-_SUBDIRS += psxpipe01
-_SUBDIRS += psxreaddir
-_SUBDIRS += psxstat
-_SUBDIRS += psxtimes01
-_SUBDIRS += psxfchx01
-
-include $(top_srcdir)/../automake/subdirs.am
+if TEST_psxglobalcon02
+psx_tests += psxglobalcon02
+psx_screens += psxglobalcon02/psxglobalcon02.scn
+psx_docs += psxglobalcon02/psxglobalcon02.doc
+psxglobalcon02_SOURCES = psxglobalcon02/init.cc
+psxglobalcon02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxglobalcon02) \
+	$(support_includes)
+endif
+endif
+endif
+
+if TEST_psxid01
+psx_tests += psxid01
+psx_screens += psxid01/psxid01.scn
+psx_docs += psxid01/psxid01.doc
+psxid01_SOURCES = psxid01/init.c
+psxid01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxid01) \
+	$(support_includes)
+endif
+
+if TEST_psximfs01
+psx_tests += psximfs01
+psx_screens += psximfs01/psximfs01.scn
+psx_docs += psximfs01/psximfs01.doc
+psximfs01_SOURCES = psximfs01/init.c
+psximfs01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psximfs01) \
+	$(support_includes)
+endif
+
+if TEST_psximfs02
+psx_tests += psximfs02
+psx_screens += psximfs02/psximfs02.scn
+psx_docs += psximfs02/psximfs02.doc
+psximfs02_SOURCES = psximfs02/init.c
+psximfs02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psximfs02) \
+	$(support_includes)
+endif
+
+if HAS_POSIX
+if TEST_psxintrcritical01
+psx_tests += psxintrcritical01
+psx_screens += psxintrcritical01/psxintrcritical01.scn
+psx_docs += psxintrcritical01/psxintrcritical01.doc
+psxintrcritical01_SOURCES = psxintrcritical01/init.c \
+	../sptests/spintrcritical_support/intrcritical.c
+psxintrcritical01_CPPFLAGS = $(AM_CPPFLAGS) \
+	$(TEST_FLAGS_psxintrcritical01) $(support_includes) \
+	-I$(top_srcdir)/../sptests/spintrcritical_support
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxitimer
+psx_tests += psxitimer
+psx_screens += psxitimer/psxitimer.scn
+psxitimer_SOURCES = psxitimer/init.c include/pmacros.h
+psxitimer_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxitimer) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if TEST_psxkey01
+psx_tests += psxkey01
+psx_screens += psxkey01/psxkey01.scn
+psxkey01_SOURCES = psxkey01/init.c psxkey01/system.h include/pmacros.h \
+	../support/src/test_support.c
+psxkey01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxkey01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_psxkey02
+psx_tests += psxkey02
+psx_screens += psxkey02/psxkey02.scn
+psx_docs += psxkey02/psxkey02.doc
+psxkey02_SOURCES = psxkey02/init.c
+psxkey02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxkey02) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_psxkey03
+psx_tests += psxkey03
+psx_screens += psxkey03/psxkey03.scn
+psx_docs += psxkey03/psxkey03.doc
+psxkey03_SOURCES = psxkey03/init.c
+psxkey03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxkey03) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_psxkey04
+psx_tests += psxkey04
+psx_screens += psxkey04/psxkey04.scn
+psx_docs += psxkey04/psxkey04.doc
+psxkey04_SOURCES = psxkey04/init.c
+psxkey04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxkey04) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_psxkey05
+psx_tests += psxkey05
+psx_screens += psxkey05/psxkey05.scn
+psx_docs += psxkey05/psxkey05.doc
+psxkey05_SOURCES = psxkey05/init.c
+psxkey05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxkey05) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_psxkey06
+psx_tests += psxkey06
+psx_screens += psxkey06/psxkey06.scn
+psx_docs += psxkey06/psxkey06.doc
+psxkey06_SOURCES = psxkey06/init.c
+psxkey06_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxkey06) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if HAS_POSIX
+if TEST_psxkey07
+psx_tests += psxkey07
+psx_screens += psxkey07/psxkey07.scn
+psx_docs += psxkey07/psxkey07.doc
+psxkey07_SOURCES = psxkey07/init.c
+psxkey07_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxkey07) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if TEST_psxkey08
+psx_tests += psxkey08
+psx_screens += psxkey08/psxkey08.scn
+psx_docs += psxkey08/psxkey08.doc
+psxkey08_SOURCES = psxkey08/init.c
+psxkey08_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxkey08) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_psxkey09
+psx_tests += psxkey09
+psx_screens += psxkey09/psxkey09.scn
+psx_docs += psxkey09/psxkey09.doc
+psxkey09_SOURCES = psxkey09/init.c
+psxkey09_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxkey09) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_psxkey10
+psx_tests += psxkey10
+psx_screens += psxkey10/psxkey10.scn
+psx_docs += psxkey10/psxkey10.doc
+psxkey10_SOURCES = psxkey10/init.c
+psxkey10_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxkey10) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if HAS_POSIX
+if TEST_psxmmap01
+psx_tests += psxmmap01
+psx_screens += psxmmap01/psxmmap01.scn
+psxmmap01_SOURCES = psxmmap01/init.c psxmmap01/test_helper.c \
+	psxmmap01/test_driver.c psxmmap01/system.h
+psxmmap01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxmmap01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if TEST_psxmount
+psx_tests += psxmount
+psx_screens += psxmount/psxmount.scn
+psxmount_SOURCES = psxmount/main.c psxmount/test.c include/pmacros.h
+psxmount_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxmount) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if HAS_POSIX
+if TEST_psxmsgq01
+psx_tests += psxmsgq01
+psx_screens += psxmsgq01/psxmsgq01.scn
+psxmsgq01_SOURCES = psxmsgq01/init.c psxmsgq01/system.h \
+	include/pmacros.h ../support/src/test_support.c
+psxmsgq01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxmsgq01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxmsgq02
+psx_tests += psxmsgq02
+psx_screens += psxmsgq02/psxmsgq02.scn
+psxmsgq02_SOURCES = psxmsgq02/init.c psxmsgq02/system.h \
+	include/pmacros.h ../support/src/test_support.c
+psxmsgq02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxmsgq02) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxmsgq03
+psx_tests += psxmsgq03
+psx_screens += psxmsgq03/psxmsgq03.scn
+psx_docs += psxmsgq03/psxmsgq03.doc
+psxmsgq03_SOURCES = psxmsgq03/init.c psxmsgq03/system.h \
+	include/pmacros.h ../support/src/test_support.c
+psxmsgq03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxmsgq03) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxmsgq04
+psx_tests += psxmsgq04
+psx_screens += psxmsgq04/psxmsgq04.scn
+psx_docs += psxmsgq04/psxmsgq04.doc
+psxmsgq04_SOURCES = psxmsgq04/init.c include/pmacros.h \
+	../support/src/test_support.c
+psxmsgq04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxmsgq04) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxmutexattr01
+psx_tests += psxmutexattr01
+psx_screens += psxmutexattr01/psxmutexattr01.scn
+psx_docs += psxmutexattr01/psxmutexattr01.doc
+psxmutexattr01_SOURCES = psxmutexattr01/init.c
+psxmutexattr01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxmutexattr01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxobj01
+psx_tests += psxobj01
+psx_screens += psxobj01/psxobj01.scn
+psx_docs += psxobj01/psxobj01.doc
+psxobj01_SOURCES = psxobj01/init.c ../support/src/test_support.c
+psxobj01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxobj01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if TEST_psxonce01
+psx_tests += psxonce01
+psx_screens += psxonce01/psxonce01.scn
+psxonce01_SOURCES = psxonce01/init.c psxonce01/system.h \
+	include/pmacros.h
+psxonce01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxonce01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_psxpasswd01
+psx_tests += psxpasswd01
+psx_screens += psxpasswd01/psxpasswd01.scn
+psx_docs += psxpasswd01/psxpasswd01.doc
+psxpasswd01_SOURCES = psxpasswd01/init.c include/pmacros.h
+psxpasswd01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxpasswd01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_psxpasswd02
+psx_tests += psxpasswd02
+psx_screens += psxpasswd02/psxpasswd02.scn
+psx_docs += psxpasswd02/psxpasswd02.doc
+psxpasswd02_SOURCES = psxpasswd02/init.c include/pmacros.h
+psxpasswd02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxpasswd02) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_psxpipe01
+psx_tests += psxpipe01
+psx_screens += psxpipe01/psxpipe01.scn
+psx_docs += psxpipe01/psxpipe01.doc
+psxpipe01_SOURCES = psxpipe01/init.c include/pmacros.h
+psxpipe01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxpipe01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_psxrdwrv
+psx_tests += psxrdwrv
+psx_screens += psxrdwrv/psxrdwrv.scn
+psxrdwrv_SOURCES = psxrdwrv/main.c psxrdwrv/test.c include/pmacros.h
+psxrdwrv_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxrdwrv) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_psxreaddir
+psx_tests += psxreaddir
+psx_screens += psxreaddir/psxreaddir.scn
+psxreaddir_SOURCES = psxreaddir/main.c psxreaddir/test.c \
+	include/pmacros.h
+psxreaddir_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxreaddir) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if HAS_POSIX
+if TEST_psxrwlock01
+psx_tests += psxrwlock01
+psx_screens += psxrwlock01/psxrwlock01.scn
+psxrwlock01_SOURCES = psxrwlock01/main.c psxrwlock01/test.c \
+	include/pmacros.h
+psxrwlock01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxrwlock01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxsem01
+psx_tests += psxsem01
+psx_screens += psxsem01/psxsem01.scn
+psxsem01_SOURCES = psxsem01/init.c include/pmacros.h \
+	../support/src/test_support.c
+psxsem01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxsem01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxshm01
+psx_tests += psxshm01
+psx_screens += psxshm01/psxshm01.scn
+psxshm01_SOURCES = psxshm01/init.c psxshm01/system.h
+psxshm01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxshm01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxshm02
+psx_tests += psxshm02
+psx_screens += psxshm02/psxshm02.scn
+psxshm02_SOURCES = psxshm02/init.c psxshm02/system.h
+psxshm02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxshm02) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxsignal01
+psx_tests += psxsignal01
+psx_screens += psxsignal01/psxsignal01.scn
+psxsignal01_SOURCES = psxsignal01/init.c psxsignal01/task1.c \
+	psxsignal01/system.h include/pmacros.h
+psxsignal01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxsignal01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxsignal02
+psx_tests += psxsignal02
+psx_screens += psxsignal02/psxsignal02.scn
+psx_docs += psxsignal02/psxsignal02.doc
+psxsignal02_SOURCES = psxsignal02/init.c include/pmacros.h
+psxsignal02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxsignal02) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxsignal03
+psx_tests += psxsignal03
+psx_screens += psxsignal03/psxsignal03.scn
+psx_docs += psxsignal03/psxsignal03.doc
+psxsignal03_SOURCES = psxsignal03/init.c include/pmacros.h
+psxsignal03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxsignal03) \
+	$(support_includes) -I$(top_srcdir)/include \
+	-DUSE_USER_SIGNALS_PROCESS
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxsignal04
+psx_tests += psxsignal04
+psx_screens += psxsignal04/psxsignal04.scn
+psx_docs += psxsignal04/psxsignal04.doc
+psxsignal04_SOURCES = psxsignal03/init.c include/pmacros.h
+psxsignal04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxsignal04) \
+	$(support_includes) -I$(top_srcdir)/include \
+	-DUSE_REAL_TIME_SIGNALS_PROCESS
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxsignal05
+psx_tests += psxsignal05
+psx_screens += psxsignal05/psxsignal05.scn
+psx_docs += psxsignal05/psxsignal05.doc
+psxsignal05_SOURCES = psxsignal05/init.c include/pmacros.h
+psxsignal05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxsignal05) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxsignal06
+psx_tests += psxsignal06
+psx_screens += psxsignal06/psxsignal06.scn
+psx_docs += psxsignal06/psxsignal06.doc
+psxsignal06_SOURCES = psxsignal06/init.c
+psxsignal06_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxsignal06) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxspin01
+psx_tests += psxspin01
+psx_screens += psxspin01/psxspin01.scn
+psxspin01_SOURCES = psxspin01/main.c psxspin01/test.c \
+	include/pmacros.h
+psxspin01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxspin01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxstack01
+psx_tests += psxstack01
+psx_screens += psxstack01/psxstack01.scn
+psx_docs += psxstack01/psxstack01.doc
+psxstack01_SOURCES = psxstack01/init.c include/pmacros.h
+psxstack01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxstack01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxstack02
+psx_tests += psxstack02
+psx_screens += psxstack02/psxstack02.scn
+psx_docs += psxstack02/psxstack02.doc
+psxstack02_SOURCES = psxstack02/init.c
+psxstack02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxstack02) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if TEST_psxstat
+psx_tests += psxstat
+psx_screens += psxstat/psxstat.scn
+psxstat_SOURCES = psxstat/main.c psxstat/test.c include/pmacros.h
+psxstat_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxstat) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if HAS_POSIX
+if TEST_psxstrsignal01
+psx_tests += psxstrsignal01
+psx_screens += psxstrsignal01/psxstrsignal01.scn
+psx_docs += psxstrsignal01/psxstrsignal01.doc
+psxstrsignal01_SOURCES = psxstrsignal01/init.c include/pmacros.h
+psxstrsignal01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxstrsignal01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxsysconf
+psx_tests += psxsysconf
+psx_screens += psxsysconf/psxsysconf.scn
+psxsysconf_SOURCES = psxsysconf/init.c psxsysconf/system.h \
+	include/pmacros.h
+psxsysconf_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxsysconf) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxthreadname01
+psx_tests += psxthreadname01
+psx_screens += psxthreadname01/psxthreadname01.scn
+psx_docs += psxthreadname01/psxthreadname01.doc
+psxthreadname01_SOURCES = psxthreadname01/init.c
+psxthreadname01_CPPFLAGS = $(AM_CPPFLAGS) \
+	$(TEST_FLAGS_psxthreadname01) $(support_includes)
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxtime
+psx_tests += psxtime
+psx_screens += psxtime/psxtime.scn
+psxtime_SOURCES = psxtime/main.c psxtime/test.c
+psxtime_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtime) \
+	$(support_includes)
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxtimer01
+psx_tests += psxtimer01
+psx_screens += psxtimer01/psxtimer01.scn
+psxtimer01_SOURCES = psxtimer01/psxtimer.c psxtimer01/system.h \
+	include/pmacros.h
+psxtimer01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtimer01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxtimer02
+psx_tests += psxtimer02
+psx_screens += psxtimer02/psxtimer02.scn
+psxtimer02_SOURCES = psxtimer02/psxtimer.c psxtimer02/system.h \
+	include/pmacros.h
+psxtimer02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtimer02) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if TEST_psxtimes01
+psx_tests += psxtimes01
+psx_screens += psxtimes01/psxtimes01.scn
+psx_docs += psxtimes01/psxtimes01.doc
+psxtimes01_SOURCES = psxtimes01/init.c ../support/src/spin.c
+psxtimes01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxtimes01) \
+	$(support_includes)
+endif
+
+if HAS_POSIX
+if TEST_psxualarm
+psx_tests += psxualarm
+psx_screens += psxualarm/psxualarm.scn
+psxualarm_SOURCES = psxualarm/init.c psxualarm/system.h \
+	include/pmacros.h
+psxualarm_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxualarm) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_psxusleep
+psx_tests += psxusleep
+psx_screens += psxusleep/psxusleep.scn
+psx_docs += psxusleep/psxusleep.doc
+psxusleep_SOURCES = psxusleep/init.c include/pmacros.h
+psxusleep_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_psxusleep) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+endif
+
+if HAS_POSIX
+if TEST_lib_a
+psx_lib += lib.a
+lib_a_SOURCES = psxhdrs/devctl/posix_devctl.c \
+	psxhdrs/pthread/pthread_attr_destroy.c \
+	psxhdrs/pthread/pthread_attr_getdetachstate.c \
+	psxhdrs/pthread/pthread_attr_getguardsize.c \
+	psxhdrs/pthread/pthread_attr_getinheritsched.c \
+	psxhdrs/pthread/pthread_attr_getschedparam.c \
+	psxhdrs/pthread/pthread_attr_getschedpolicy.c \
+	psxhdrs/pthread/pthread_attr_getscope.c \
+	psxhdrs/pthread/pthread_attr_getstackaddr.c \
+	psxhdrs/pthread/pthread_attr_getstack.c \
+	psxhdrs/pthread/pthread_attr_getstacksize.c \
+	psxhdrs/pthread/pthread_attr_init.c \
+	psxhdrs/pthread/pthread_attr_setdetachstate.c \
+	psxhdrs/pthread/pthread_attr_setguardsize.c \
+	psxhdrs/pthread/pthread_attr_setinheritsched.c \
+	psxhdrs/pthread/pthread_attr_setschedparam.c \
+	psxhdrs/pthread/pthread_attr_setschedpolicy.c \
+	psxhdrs/pthread/pthread_attr_setscope.c \
+	psxhdrs/pthread/pthread_attr_setstackaddr.c \
+	psxhdrs/pthread/pthread_attr_setstack.c \
+	psxhdrs/pthread/pthread_attr_setstacksize.c \
+	psxhdrs/pthread/pthread_cancel.c psxhdrs/pthread/pthread_cleanup.c \
+	psxhdrs/pthread/pthread_condattr_destroy.c \
+	psxhdrs/pthread/pthread_condattr_getpshared.c \
+	psxhdrs/pthread/pthread_condattr_init.c \
+	psxhdrs/pthread/pthread_condattr_setpshared.c \
+	psxhdrs/pthread/pthread_cond_broadcast.c \
+	psxhdrs/pthread/pthread_cond_destroy.c \
+	psxhdrs/pthread/pthread_cond_init.c \
+	psxhdrs/pthread/pthread_cond_signal.c \
+	psxhdrs/pthread/pthread_cond_timedwait.c \
+	psxhdrs/pthread/pthread_cond_wait.c psxhdrs/pthread/pthread_create.c \
+	psxhdrs/pthread/pthread_detach.c psxhdrs/pthread/pthread_equal.c \
+	psxhdrs/pthread/pthread_exit.c \
+	psxhdrs/pthread/pthread_getconcurrency.c \
+	psxhdrs/pthread/pthread_getcpuclockid.c \
+	psxhdrs/pthread/pthread_getschedparam.c \
+	psxhdrs/pthread/pthread_getspecific.c psxhdrs/pthread/pthread_join.c \
+	psxhdrs/pthread/pthread_key_create.c \
+	psxhdrs/pthread/pthread_key_delete.c \
+	psxhdrs/pthread/pthread_mutexattr_destroy.c \
+	psxhdrs/pthread/pthread_mutexattr_getprioceiling.c \
+	psxhdrs/pthread/pthread_mutexattr_getprotocol.c \
+	psxhdrs/pthread/pthread_mutexattr_getpshared.c \
+	psxhdrs/pthread/pthread_mutexattr_init.c \
+	psxhdrs/pthread/pthread_mutexattr_setprioceiling.c \
+	psxhdrs/pthread/pthread_mutexattr_setprotocol.c \
+	psxhdrs/pthread/pthread_mutexattr_setpshared.c \
+	psxhdrs/pthread/pthread_mutex_destroy.c \
+	psxhdrs/pthread/pthread_mutex_getprioceiling.c \
+	psxhdrs/pthread/pthread_mutex_init.c \
+	psxhdrs/pthread/pthread_mutex_lock.c \
+	psxhdrs/pthread/pthread_mutex_setprioceiling.c \
+	psxhdrs/pthread/pthread_mutex_timedlock.c \
+	psxhdrs/pthread/pthread_mutex_trylock.c \
+	psxhdrs/pthread/pthread_mutex_unlock.c psxhdrs/pthread/pthread_once.c \
+	psxhdrs/pthread/pthread_self.c \
+	psxhdrs/pthread/pthread_setcancelstate.c \
+	psxhdrs/pthread/pthread_setcanceltype.c \
+	psxhdrs/pthread/pthread_setconcurrency.c \
+	psxhdrs/pthread/pthread_setschedparam.c \
+	psxhdrs/pthread/pthread_setspecific.c \
+	psxhdrs/pthread/pthread_testcancel.c psxhdrs/sched/sched_getparam.c \
+	psxhdrs/sched/sched_get_priority_max.c \
+	psxhdrs/sched/sched_get_priority_min.c \
+	psxhdrs/sched/sched_getscheduler.c \
+	psxhdrs/sched/sched_rr_get_interval.c psxhdrs/sched/sched_setparam.c \
+	psxhdrs/sched/sched_setscheduler.c psxhdrs/sched/sched_yield.c \
+	psxhdrs/signal/pthread_sigmask.c psxhdrs/signal/raise.c \
+	psxhdrs/signal/signal.c psxhdrs/signal/sigpending.c \
+	psxhdrs/signal/sigprocmask.c psxhdrs/signal/sigsuspend.c \
+	psxhdrs/signal/sigtimedwait.c psxhdrs/signal/sigwait.c \
+	psxhdrs/signal/sigwaitinfo.c psxhdrs/time/asctime.c \
+	psxhdrs/time/asctime_r.c psxhdrs/time/clock.c \
+	psxhdrs/time/clock_getcpuclockid.c psxhdrs/time/clock_getres.c \
+	psxhdrs/time/clock_gettime.c psxhdrs/time/clock_nanosleep.c \
+	psxhdrs/time/clock_settime.c psxhdrs/time/ctime.c \
+	psxhdrs/time/ctime_r.c psxhdrs/time/difftime.c psxhdrs/time/gmtime.c \
+	psxhdrs/time/gmtime_r.c psxhdrs/time/localtime.c \
+	psxhdrs/time/localtime_r.c psxhdrs/time/mktime.c \
+	psxhdrs/time/nanosleep.c psxhdrs/time/strftime.c psxhdrs/time/time.c \
+	psxhdrs/time/timer_create.c psxhdrs/time/timer_delete.c \
+	psxhdrs/time/timer_getoverrun.c psxhdrs/time/timer_gettime.c \
+	psxhdrs/time/timer_settime.c psxhdrs/unistd/alarm.c \
+	psxhdrs/unistd/fdatasync.c psxhdrs/unistd/fsync.c \
+	psxhdrs/unistd/getegid.c psxhdrs/unistd/geteuid.c \
+	psxhdrs/unistd/getgid.c psxhdrs/unistd/getgroups.c \
+	psxhdrs/unistd/getlogin.c psxhdrs/unistd/getlogin_r.c \
+	psxhdrs/unistd/getpgrp.c psxhdrs/unistd/getpid.c \
+	psxhdrs/unistd/getppid.c psxhdrs/unistd/getuid.c \
+	psxhdrs/unistd/pause.c psxhdrs/unistd/setgid.c \
+	psxhdrs/unistd/setgroups.c psxhdrs/unistd/setpgid.c \
+	psxhdrs/unistd/setsid.c psxhdrs/unistd/setuid.c \
+	psxhdrs/unistd/sleep.c psxhdrs/unistd/sync.c psxhdrs/unistd/ualarm.c \
+	psxhdrs/unistd/usleep.c psxhdrs/sys/mman/mlockall.c \
+	psxhdrs/sys/mman/mlock.c psxhdrs/sys/mman/mmap.c \
+	psxhdrs/sys/mman/mprotect.c psxhdrs/sys/mman/msync.c \
+	psxhdrs/sys/mman/munlockall.c psxhdrs/sys/mman/munlock.c \
+	psxhdrs/sys/mman/munmap.c psxhdrs/sys/mman/posix_madvise.c \
+	psxhdrs/sys/mman/shm_open.c psxhdrs/sys/mman/shm_unlink.c \
+	psxhdrs/sys/socket/accept.c psxhdrs/sys/socket/bind.c \
+	psxhdrs/sys/socket/connect.c psxhdrs/sys/socket/getpeername.c \
+	psxhdrs/sys/socket/getsockname.c psxhdrs/sys/socket/getsockopt.c \
+	psxhdrs/sys/socket/listen.c psxhdrs/sys/socket/recv.c \
+	psxhdrs/sys/socket/recvfrom.c psxhdrs/sys/socket/recvmsg.c \
+	psxhdrs/sys/socket/send.c psxhdrs/sys/socket/sendmsg.c \
+	psxhdrs/sys/socket/sendto.c psxhdrs/sys/socket/setsockopt.c \
+	psxhdrs/sys/socket/shutdown.c psxhdrs/sys/socket/socket.c \
+	psxhdrs/sys/socket/socketpair.c
+endif
+endif
+
+rtems_tests_PROGRAMS = $(psx_tests)
+noinst_LIBRARIES = $(psx_lib)
+dist_rtems_tests_DATA = $(psx_screens) $(psx_docs)
+
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/configure.ac b/testsuites/psxtests/configure.ac
index e84d92c0cc..84122247fa 100644
--- a/testsuites/psxtests/configure.ac
+++ b/testsuites/psxtests/configure.ac
@@ -108,110 +108,110 @@ AC_CHECK_SIZEOF([blkcnt_t])
 AC_CHECK_SIZEOF([time_t])
 AC_CHECK_SIZEOF([mode_t])
 
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
-psx01/Makefile
-psx02/Makefile
-psx03/Makefile
-psx04/Makefile
-psx05/Makefile
-psx06/Makefile
-psx07/Makefile
-psx08/Makefile
-psx09/Makefile
-psx10/Makefile
-psx11/Makefile
-psx12/Makefile
-psx13/Makefile
-psx14/Makefile
-psx15/Makefile
-psx16/Makefile
-psxaio01/Makefile
-psxaio02/Makefile
-psxaio03/Makefile
-psxalarm01/Makefile
-psxautoinit01/Makefile
-psxautoinit02/Makefile
-psxbarrier01/Makefile
-psxcancel/Makefile
-psxcancel01/Makefile
-psxchroot01/Makefile
-psxclassic01/Makefile
-psxcleanup/Makefile
-psxcleanup01/Makefile
-psxcleanup02/Makefile
-psxclock/Makefile
-psxclock01/Makefile
-psxclockrealtime01/Makefile
-psxconcurrency01/Makefile
-psxcond01/Makefile
-psxcond02/Makefile
-psxconfig01/Makefile
-psxdevctl01/Makefile
-psxeintr_join/Makefile
-psxenosys/Makefile
-psxfatal01/Makefile
-psxfatal02/Makefile
-psxfchx01/Makefile
-psxfile01/Makefile
-psxfile02/Makefile
-psxfilelock01/Makefile
-psxgetattrnp01/Makefile
-psxgetrusage01/Makefile
-psxglobalcon01/Makefile
-psxglobalcon02/Makefile
-psxhdrs/Makefile
-psxid01/Makefile
-psximfs01/Makefile
-psximfs02/Makefile
-psxintrcritical01/Makefile
-psxitimer/Makefile
-psxkey01/Makefile
-psxkey02/Makefile
-psxkey03/Makefile
-psxkey04/Makefile
-psxkey05/Makefile
-psxkey06/Makefile
-psxkey07/Makefile
-psxkey08/Makefile
-psxkey09/Makefile
-psxkey10/Makefile
-psxmount/Makefile
-psxmsgq01/Makefile
-psxmsgq02/Makefile
-psxmsgq03/Makefile
-psxmsgq04/Makefile
-psxmutexattr01/Makefile
-psxobj01/Makefile
-psxonce01/Makefile
-psxpasswd01/Makefile
-psxpasswd02/Makefile
-psxpipe01/Makefile
-psxrdwrv/Makefile
-psxreaddir/Makefile
-psxrwlock01/Makefile
-psxsem01/Makefile
-psxshm01/Makefile
-psxshm02/Makefile
-psxmmap01/Makefile
-psxsignal01/Makefile
-psxsignal02/Makefile
-psxsignal03/Makefile
-psxsignal04/Makefile
-psxsignal05/Makefile
-psxsignal06/Makefile
-psxspin01/Makefile
-psxstack01/Makefile
-psxstack02/Makefile
-psxstat/Makefile
-psxstrsignal01/Makefile
-psxsysconf/Makefile
-psxthreadname01/Makefile
-psxtime/Makefile
-psxtimer01/Makefile
-psxtimer02/Makefile
-psxtimes01/Makefile
-psxualarm/Makefile
-psxusleep/Makefile
-])
+# BSP Test configuration
+RTEMS_TEST_CHECK([psx01])
+RTEMS_TEST_CHECK([psx02])
+RTEMS_TEST_CHECK([psx03])
+RTEMS_TEST_CHECK([psx04])
+RTEMS_TEST_CHECK([psx05])
+RTEMS_TEST_CHECK([psx06])
+RTEMS_TEST_CHECK([psx07])
+RTEMS_TEST_CHECK([psx08])
+RTEMS_TEST_CHECK([psx09])
+RTEMS_TEST_CHECK([psx10])
+RTEMS_TEST_CHECK([psx11])
+RTEMS_TEST_CHECK([psx12])
+RTEMS_TEST_CHECK([psx13])
+RTEMS_TEST_CHECK([psx14])
+RTEMS_TEST_CHECK([psx15])
+RTEMS_TEST_CHECK([psx16])
+RTEMS_TEST_CHECK([psxaio01])
+RTEMS_TEST_CHECK([psxaio02])
+RTEMS_TEST_CHECK([psxaio03])
+RTEMS_TEST_CHECK([psxalarm01])
+RTEMS_TEST_CHECK([psxautoinit01])
+RTEMS_TEST_CHECK([psxautoinit02])
+RTEMS_TEST_CHECK([psxbarrier01])
+RTEMS_TEST_CHECK([psxcancel])
+RTEMS_TEST_CHECK([psxcancel01])
+RTEMS_TEST_CHECK([psxchroot01])
+RTEMS_TEST_CHECK([psxclassic01])
+RTEMS_TEST_CHECK([psxcleanup])
+RTEMS_TEST_CHECK([psxcleanup01])
+RTEMS_TEST_CHECK([psxcleanup02])
+RTEMS_TEST_CHECK([psxclock])
+RTEMS_TEST_CHECK([psxclock01])
+RTEMS_TEST_CHECK([psxclockrealtime01])
+RTEMS_TEST_CHECK([psxconcurrency01])
+RTEMS_TEST_CHECK([psxcond01])
+RTEMS_TEST_CHECK([psxcond02])
+RTEMS_TEST_CHECK([psxconfig01])
+RTEMS_TEST_CHECK([psxdevctl01])
+RTEMS_TEST_CHECK([psxeintr_join])
+RTEMS_TEST_CHECK([psxenosys])
+RTEMS_TEST_CHECK([psxfatal01])
+RTEMS_TEST_CHECK([psxfatal02])
+RTEMS_TEST_CHECK([psxfchx01])
+RTEMS_TEST_CHECK([psxfile01])
+RTEMS_TEST_CHECK([psxfile02])
+RTEMS_TEST_CHECK([psxfilelock01])
+RTEMS_TEST_CHECK([psxgetattrnp01])
+RTEMS_TEST_CHECK([psxgetrusage01])
+RTEMS_TEST_CHECK([psxglobalcon01])
+RTEMS_TEST_CHECK([psxglobalcon02])
+RTEMS_TEST_CHECK([psxid01])
+RTEMS_TEST_CHECK([psximfs01])
+RTEMS_TEST_CHECK([psximfs02])
+RTEMS_TEST_CHECK([psxintrcritical01])
+RTEMS_TEST_CHECK([psxitimer])
+RTEMS_TEST_CHECK([psxkey01])
+RTEMS_TEST_CHECK([psxkey02])
+RTEMS_TEST_CHECK([psxkey03])
+RTEMS_TEST_CHECK([psxkey04])
+RTEMS_TEST_CHECK([psxkey05])
+RTEMS_TEST_CHECK([psxkey06])
+RTEMS_TEST_CHECK([psxkey07])
+RTEMS_TEST_CHECK([psxkey08])
+RTEMS_TEST_CHECK([psxkey09])
+RTEMS_TEST_CHECK([psxkey10])
+RTEMS_TEST_CHECK([psxmmap01])
+RTEMS_TEST_CHECK([psxmount])
+RTEMS_TEST_CHECK([psxmsgq01])
+RTEMS_TEST_CHECK([psxmsgq02])
+RTEMS_TEST_CHECK([psxmsgq03])
+RTEMS_TEST_CHECK([psxmsgq04])
+RTEMS_TEST_CHECK([psxmutexattr01])
+RTEMS_TEST_CHECK([psxobj01])
+RTEMS_TEST_CHECK([psxonce01])
+RTEMS_TEST_CHECK([psxpasswd01])
+RTEMS_TEST_CHECK([psxpasswd02])
+RTEMS_TEST_CHECK([psxpipe01])
+RTEMS_TEST_CHECK([psxrdwrv])
+RTEMS_TEST_CHECK([psxreaddir])
+RTEMS_TEST_CHECK([psxrwlock01])
+RTEMS_TEST_CHECK([psxsem01])
+RTEMS_TEST_CHECK([psxshm01])
+RTEMS_TEST_CHECK([psxshm02])
+RTEMS_TEST_CHECK([psxsignal01])
+RTEMS_TEST_CHECK([psxsignal02])
+RTEMS_TEST_CHECK([psxsignal03])
+RTEMS_TEST_CHECK([psxsignal04])
+RTEMS_TEST_CHECK([psxsignal05])
+RTEMS_TEST_CHECK([psxsignal06])
+RTEMS_TEST_CHECK([psxspin01])
+RTEMS_TEST_CHECK([psxstack01])
+RTEMS_TEST_CHECK([psxstack02])
+RTEMS_TEST_CHECK([psxstat])
+RTEMS_TEST_CHECK([psxstrsignal01])
+RTEMS_TEST_CHECK([psxsysconf])
+RTEMS_TEST_CHECK([psxthreadname01])
+RTEMS_TEST_CHECK([psxtime])
+RTEMS_TEST_CHECK([psxtimer01])
+RTEMS_TEST_CHECK([psxtimer02])
+RTEMS_TEST_CHECK([psxtimes01])
+RTEMS_TEST_CHECK([psxualarm])
+RTEMS_TEST_CHECK([psxusleep])
+RTEMS_TEST_CHECK([lib_a])
+
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/testsuites/psxtests/psx01/Makefile.am b/testsuites/psxtests/psx01/Makefile.am
deleted file mode 100644
index 071499a9d6..0000000000
--- a/testsuites/psxtests/psx01/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psx01
-psx01_SOURCES = init.c task.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psx01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx01_OBJECTS)
-LINK_LIBS = $(psx01_LDLIBS)
-
-psx01$(EXEEXT): $(psx01_OBJECTS) $(psx01_DEPENDENCIES)
-	@rm -f psx01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx02/Makefile.am b/testsuites/psxtests/psx02/Makefile.am
deleted file mode 100644
index 0c9cdf5312..0000000000
--- a/testsuites/psxtests/psx02/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psx02
-psx02_SOURCES = init.c task.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psx02.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx02_OBJECTS)
-LINK_LIBS = $(psx02_LDLIBS)
-
-psx02$(EXEEXT): $(psx02_OBJECTS) $(psx02_DEPENDENCIES)
-	@rm -f psx02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx03/Makefile.am b/testsuites/psxtests/psx03/Makefile.am
deleted file mode 100644
index e77ad152dd..0000000000
--- a/testsuites/psxtests/psx03/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psx03
-psx03_SOURCES = init.c task.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psx03.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx03_OBJECTS)
-LINK_LIBS = $(psx03_LDLIBS)
-
-psx03$(EXEEXT): $(psx03_OBJECTS) $(psx03_DEPENDENCIES)
-	@rm -f psx03$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx04/Makefile.am b/testsuites/psxtests/psx04/Makefile.am
deleted file mode 100644
index 5f6e05be81..0000000000
--- a/testsuites/psxtests/psx04/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psx04
-psx04_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psx04.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx04_OBJECTS)
-LINK_LIBS = $(psx04_LDLIBS)
-
-psx04$(EXEEXT): $(psx04_OBJECTS) $(psx04_DEPENDENCIES)
-	@rm -f psx04$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx05/Makefile.am b/testsuites/psxtests/psx05/Makefile.am
deleted file mode 100644
index 58b8011746..0000000000
--- a/testsuites/psxtests/psx05/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psx05
-psx05_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psx05.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx05_OBJECTS)
-LINK_LIBS = $(psx05_LDLIBS)
-
-psx05$(EXEEXT): $(psx05_OBJECTS) $(psx05_DEPENDENCIES)
-	@rm -f psx05$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx06/Makefile.am b/testsuites/psxtests/psx06/Makefile.am
deleted file mode 100644
index 51797d7ab9..0000000000
--- a/testsuites/psxtests/psx06/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psx06
-psx06_SOURCES = init.c task.c task2.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psx06.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx06_OBJECTS)
-LINK_LIBS = $(psx06_LDLIBS)
-
-psx06$(EXEEXT): $(psx06_OBJECTS) $(psx06_DEPENDENCIES)
-	@rm -f psx06$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx07/Makefile.am b/testsuites/psxtests/psx07/Makefile.am
deleted file mode 100644
index 40a76bb099..0000000000
--- a/testsuites/psxtests/psx07/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psx07
-psx07_SOURCES = init.c task.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA  = psx07.scn
-dist_rtems_tests_DATA += psx07.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx07_OBJECTS)
-LINK_LIBS = $(psx07_LDLIBS)
-
-psx07$(EXEEXT): $(psx07_OBJECTS) $(psx07_DEPENDENCIES)
-	@rm -f psx07$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx08/Makefile.am b/testsuites/psxtests/psx08/Makefile.am
deleted file mode 100644
index 7e53ff9cb6..0000000000
--- a/testsuites/psxtests/psx08/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psx08
-psx08_SOURCES = init.c task1.c task2.c task3.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psx08.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx08_OBJECTS)
-LINK_LIBS = $(psx08_LDLIBS)
-
-psx08$(EXEEXT): $(psx08_OBJECTS) $(psx08_DEPENDENCIES)
-	@rm -f psx08$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx09/Makefile.am b/testsuites/psxtests/psx09/Makefile.am
deleted file mode 100644
index 361b8fefe7..0000000000
--- a/testsuites/psxtests/psx09/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psx09
-psx09_SOURCES = init.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psx09.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx09_OBJECTS)
-LINK_LIBS = $(psx09_LDLIBS)
-
-psx09$(EXEEXT): $(psx09_OBJECTS) $(psx09_DEPENDENCIES)
-	@rm -f psx09$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx10/Makefile.am b/testsuites/psxtests/psx10/Makefile.am
deleted file mode 100644
index 70e471791e..0000000000
--- a/testsuites/psxtests/psx10/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psx10
-psx10_SOURCES = init.c task.c task2.c task3.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psx10.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx10_OBJECTS)
-LINK_LIBS = $(psx10_LDLIBS)
-
-psx10$(EXEEXT): $(psx10_OBJECTS) $(psx10_DEPENDENCIES)
-	@rm -f psx10$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx11/Makefile.am b/testsuites/psxtests/psx11/Makefile.am
deleted file mode 100644
index b88f17347d..0000000000
--- a/testsuites/psxtests/psx11/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psx11
-psx11_SOURCES = init.c task.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psx11.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx11_OBJECTS)
-LINK_LIBS = $(psx11_LDLIBS)
-
-psx11$(EXEEXT): $(psx11_OBJECTS) $(psx11_DEPENDENCIES)
-	@rm -f psx11$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx12/Makefile.am b/testsuites/psxtests/psx12/Makefile.am
deleted file mode 100644
index c6325309e9..0000000000
--- a/testsuites/psxtests/psx12/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psx12
-psx12_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psx12.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx12_OBJECTS)
-LINK_LIBS = $(psx12_LDLIBS)
-
-psx12$(EXEEXT): $(psx12_OBJECTS) $(psx12_DEPENDENCIES)
-	@rm -f psx12$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx13/Makefile.am b/testsuites/psxtests/psx13/Makefile.am
deleted file mode 100644
index 1cebd9f003..0000000000
--- a/testsuites/psxtests/psx13/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psx13
-psx13_SOURCES = main.c test.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psx13.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx13_OBJECTS)
-LINK_LIBS = $(psx13_LDLIBS)
-
-psx13$(EXEEXT): $(psx13_OBJECTS) $(psx13_DEPENDENCIES)
-	@rm -f psx13$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx14/Makefile.am b/testsuites/psxtests/psx14/Makefile.am
deleted file mode 100644
index b023e278ba..0000000000
--- a/testsuites/psxtests/psx14/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psx14
-psx14_SOURCES = init.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psx14.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx14_OBJECTS)
-LINK_LIBS = $(psx14_LDLIBS)
-
-psx14$(EXEEXT): $(psx14_OBJECTS) $(psx14_DEPENDENCIES)
-	@rm -f psx14$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx15/Makefile.am b/testsuites/psxtests/psx15/Makefile.am
deleted file mode 100644
index 029c472610..0000000000
--- a/testsuites/psxtests/psx15/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psx15
-psx15_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psx15.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx15_OBJECTS)
-LINK_LIBS = $(psx15_LDLIBS)
-
-psx15$(EXEEXT): $(psx15_OBJECTS) $(psx15_DEPENDENCIES)
-	@rm -f psx15$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psx16/Makefile.am b/testsuites/psxtests/psx16/Makefile.am
deleted file mode 100644
index 7c356659a2..0000000000
--- a/testsuites/psxtests/psx16/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psx16
-psx16_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psx16.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psx16_OBJECTS)
-LINK_LIBS = $(psx16_LDLIBS)
-
-psx16$(EXEEXT): $(psx16_OBJECTS) $(psx16_DEPENDENCIES)
-	@rm -f psx16$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxaio01/Makefile.am b/testsuites/psxtests/psxaio01/Makefile.am
deleted file mode 100644
index 7f422ce04b..0000000000
--- a/testsuites/psxtests/psxaio01/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxaio01
-psxaio01_SOURCES = init.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxaio01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxaio01_OBJECTS)
-LINK_LIBS = $(psxaio01_LDLIBS)
-
-psxaio01$(EXEEXT): $(psxaio01_OBJECTS) $(psxaio01_DEPENDENCIES)
-	@rm -f psxaio01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
\ No newline at end of file
diff --git a/testsuites/psxtests/psxaio02/Makefile.am b/testsuites/psxtests/psxaio02/Makefile.am
deleted file mode 100644
index 0d98c09cf5..0000000000
--- a/testsuites/psxtests/psxaio02/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxaio02
-psxaio02_SOURCES = init.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxaio02.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxaio02_OBJECTS)
-LINK_LIBS = $(psxaio02_LDLIBS)
-
-psxaio02$(EXEEXT): $(psxaio02_OBJECTS) $(psxaio02_DEPENDENCIES)
-	@rm -f psxaio02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
\ No newline at end of file
diff --git a/testsuites/psxtests/psxaio03/Makefile.am b/testsuites/psxtests/psxaio03/Makefile.am
deleted file mode 100644
index 635a511438..0000000000
--- a/testsuites/psxtests/psxaio03/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxaio03
-psxaio03_SOURCES = init.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxaio03.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxaio03_OBJECTS)
-LINK_LIBS = $(psxaio02_LDLIBS)
-
-psxaio03$(EXEEXT): $(psxaio03_OBJECTS) $(psxaio03_DEPENDENCIES)
-	@rm -f psxaio03$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
\ No newline at end of file
diff --git a/testsuites/psxtests/psxalarm01/Makefile.am b/testsuites/psxtests/psxalarm01/Makefile.am
deleted file mode 100644
index 863da19c87..0000000000
--- a/testsuites/psxtests/psxalarm01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxalarm01
-psxalarm01_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxalarm01.scn
-dist_rtems_tests_DATA += psxalarm01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxalarm01_OBJECTS)
-LINK_LIBS = $(psxalarm01_LDLIBS)
-
-psxalarm01$(EXEEXT): $(psxalarm01_OBJECTS) $(psxalarm01_DEPENDENCIES)
-	@rm -f psxalarm01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxautoinit01/Makefile.am b/testsuites/psxtests/psxautoinit01/Makefile.am
deleted file mode 100644
index 1f0c4f75c1..0000000000
--- a/testsuites/psxtests/psxautoinit01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxautoinit01
-psxautoinit01_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxautoinit01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxautoinit01_OBJECTS)
-LINK_LIBS = $(psxautoinit01_LDLIBS)
-
-psxautoinit01$(EXEEXT): $(psxautoinit01_OBJECTS) \
-    $(psxautoinit01_DEPENDENCIES)
-	@rm -f psxautoinit01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxautoinit02/Makefile.am b/testsuites/psxtests/psxautoinit02/Makefile.am
deleted file mode 100644
index 1b93cd32e1..0000000000
--- a/testsuites/psxtests/psxautoinit02/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-
-rtems_tests_PROGRAMS = psxautoinit02
-psxautoinit02_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxautoinit02.scn
-dist_rtems_tests_DATA += psxautoinit02.doc
-
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxautoinit02_OBJECTS)
-LINK_LIBS = $(psxautoinit02_LDLIBS)
-
-psxautoinit02$(EXEEXT): $(psxautoinit02_OBJECTS) \
-    $(psxautoinit02_DEPENDENCIES)
-	@rm -f psxautoinit02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxbarrier01/Makefile.am b/testsuites/psxtests/psxbarrier01/Makefile.am
deleted file mode 100644
index 1ba3ad6387..0000000000
--- a/testsuites/psxtests/psxbarrier01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxbarrier01
-psxbarrier01_SOURCES = main.c test.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxbarrier01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxbarrier01_OBJECTS)
-LINK_LIBS = $(psxbarrier01_LDLIBS)
-
-psxbarrier01$(EXEEXT): $(psxbarrier01_OBJECTS) \
-    $(psxbarrier01_DEPENDENCIES)
-	@rm -f psxbarrier01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxcancel/Makefile.am b/testsuites/psxtests/psxcancel/Makefile.am
deleted file mode 100644
index e7504db0bc..0000000000
--- a/testsuites/psxtests/psxcancel/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxcancel
-psxcancel_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxcancel.scn
-dist_rtems_tests_DATA += psxcancel.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxcancel_OBJECTS)
-LINK_LIBS = $(psxcancel_LDLIBS)
-
-psxcancel$(EXEEXT): $(psxcancel_OBJECTS) $(psxcancel_DEPENDENCIES)
-	@rm -f psxcancel$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxcancel01/Makefile.am b/testsuites/psxtests/psxcancel01/Makefile.am
deleted file mode 100644
index 212b4d051a..0000000000
--- a/testsuites/psxtests/psxcancel01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxcancel01
-psxcancel01_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxcancel01.scn
-dist_rtems_tests_DATA += psxcancel01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxcancel01_OBJECTS)
-LINK_LIBS = $(psxcancel01_LDLIBS)
-
-psxcancel01$(EXEEXT): $(psxcancel01_OBJECTS) $(psxcancel01_DEPENDENCIES)
-	@rm -f psxcancel01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxchroot01/Makefile.am b/testsuites/psxtests/psxchroot01/Makefile.am
deleted file mode 100644
index 8fe780b90f..0000000000
--- a/testsuites/psxtests/psxchroot01/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxchroot01
-psxchroot01_SOURCES = main.c test.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxchroot01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxchroot01_OBJECTS)
-LINK_LIBS = $(psxchroot01_LDLIBS)
-
-psxchroot01$(EXEEXT): $(psxchroot01_OBJECTS) $(psxchroot01_DEPENDENCIES)
-	@rm -f psxchroot01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxclassic01/Makefile.am b/testsuites/psxtests/psxclassic01/Makefile.am
deleted file mode 100644
index 7bd98440dd..0000000000
--- a/testsuites/psxtests/psxclassic01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxclassic01
-psxclassic01_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxclassic01.scn
-dist_rtems_tests_DATA += psxclassic01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxclassic01_OBJECTS)
-LINK_LIBS = $(psxclassic01_LDLIBS)
-
-psxclassic01$(EXEEXT): $(psxclassic01_OBJECTS) $(psxclassic01_DEPENDENCIES)
-	@rm -f psxclassic01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxcleanup/Makefile.am b/testsuites/psxtests/psxcleanup/Makefile.am
deleted file mode 100644
index 948d10c4a1..0000000000
--- a/testsuites/psxtests/psxcleanup/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxcleanup
-psxcleanup_SOURCES = psxcleanup.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxcleanup.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxcleanup_OBJECTS)
-LINK_LIBS = $(psxcleanup_LDLIBS)
-
-psxcleanup$(EXEEXT): $(psxcleanup_OBJECTS) $(psxcleanup_DEPENDENCIES)
-	@rm -f psxcleanup$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxcleanup01/Makefile.am b/testsuites/psxtests/psxcleanup01/Makefile.am
deleted file mode 100644
index ac4cd1ddf0..0000000000
--- a/testsuites/psxtests/psxcleanup01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxcleanup01
-psxcleanup01_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxcleanup01.scn
-dist_rtems_tests_DATA += psxcleanup01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxcleanup01_OBJECTS)
-LINK_LIBS = $(psxcleanup01_LDLIBS)
-
-psxcleanup01$(EXEEXT): $(psxcleanup01_OBJECTS) $(psxcleanup01_DEPENDENCIES)
-	@rm -f psxcleanup01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxcleanup02/Makefile.am b/testsuites/psxtests/psxcleanup02/Makefile.am
deleted file mode 100644
index 6df81d332b..0000000000
--- a/testsuites/psxtests/psxcleanup02/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = psxcleanup02
-psxcleanup02_SOURCES = init.c main.c
-
-dist_rtems_tests_DATA = psxcleanup02.scn psxcleanup02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxcleanup02_OBJECTS)
-LINK_LIBS = $(psxcleanup02_LDLIBS)
-
-psxcleanup02$(EXEEXT): $(psxcleanup02_OBJECTS) $(psxcleanup02_DEPENDENCIES)
-	@rm -f psxcleanup02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxclock/Makefile.am b/testsuites/psxtests/psxclock/Makefile.am
deleted file mode 100644
index d8781d150b..0000000000
--- a/testsuites/psxtests/psxclock/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxclock
-psxclock_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxclock.scn
-dist_rtems_tests_DATA += psxclock.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxclock_OBJECTS)
-LINK_LIBS = $(psxclock_LDLIBS)
-
-psxclock$(EXEEXT): $(psxclock_OBJECTS) $(psxclock_DEPENDENCIES)
-	@rm -f psxclock$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxclock01/Makefile.am b/testsuites/psxtests/psxclock01/Makefile.am
deleted file mode 100644
index acb8f6dc67..0000000000
--- a/testsuites/psxtests/psxclock01/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-rtems_tests_PROGRAMS = psxclock01
-psxclock01_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxclock01.scn
-dist_rtems_tests_DATA += psxclock01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxclock01_OBJECTS) $(psxclock01_LDADD)
-LINK_LIBS = $(psxclock01_LDLIBS)
-
-psxclock01$(EXEEXT): $(psxclock01_OBJECTS) $(psxclock01_DEPENDENCIES)
-	@rm -f psxclock01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxclockrealtime01/Makefile.am b/testsuites/psxtests/psxclockrealtime01/Makefile.am
deleted file mode 100644
index d0b1a76dbe..0000000000
--- a/testsuites/psxtests/psxclockrealtime01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = psxclockrealtime01
-psxclockrealtime01_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxclockrealtime01.scn psxclockrealtime01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxclockrealtime01_OBJECTS)
-LINK_LIBS = $(psxclockrealtime01_LDLIBS)
-
-psxclockrealtime01$(EXEEXT): $(psxclockrealtime01_OBJECTS) $(psxclockrealtime01_DEPENDENCIES)
-	@rm -f psxclockrealtime01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxconcurrency01/Makefile.am b/testsuites/psxtests/psxconcurrency01/Makefile.am
deleted file mode 100644
index 2be4ebb989..0000000000
--- a/testsuites/psxtests/psxconcurrency01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxconcurrency01
-psxconcurrency01_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxconcurrency01.scn
-dist_rtems_tests_DATA += psxconcurrency01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxconcurrency01_OBJECTS)
-LINK_LIBS = $(psxconcurrency01_LDLIBS)
-
-psxconcurrency01$(EXEEXT): $(psxconcurrency01_OBJECTS) $(psxconcurrency01_DEPENDENCIES)
-	@rm -f psxconcurrency01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxcond01/Makefile.am b/testsuites/psxtests/psxcond01/Makefile.am
deleted file mode 100644
index 3beb3af997..0000000000
--- a/testsuites/psxtests/psxcond01/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-rtems_tests_PROGRAMS = psxcond01
-psxcond01_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxcond01.scn
-dist_rtems_tests_DATA += psxcond01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxcond01_OBJECTS)
-LINK_LIBS = $(psxcond01_LDLIBS)
-
-psxcond01$(EXEEXT): $(psxcond01_OBJECTS) \
-    $(psxcond01_DEPENDENCIES)
-	@rm -f psxcond01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxcond02/Makefile.am b/testsuites/psxtests/psxcond02/Makefile.am
deleted file mode 100644
index 82aa29c20e..0000000000
--- a/testsuites/psxtests/psxcond02/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-rtems_tests_PROGRAMS = psxcond02
-psxcond02_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxcond02.scn
-dist_rtems_tests_DATA += psxcond02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxcond02_OBJECTS)
-LINK_LIBS = $(psxcond02_LDLIBS)
-
-psxcond02$(EXEEXT): $(psxcond02_OBJECTS) \
-    $(psxcond02_DEPENDENCIES)
-	@rm -f psxcond02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxconfig01/Makefile.am b/testsuites/psxtests/psxconfig01/Makefile.am
deleted file mode 100644
index 95494ca7a7..0000000000
--- a/testsuites/psxtests/psxconfig01/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-rtems_tests_PROGRAMS = psxconfig01
-psxconfig01_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxconfig01.scn
-dist_rtems_tests_DATA += psxconfig01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxconfig01_OBJECTS)
-LINK_LIBS = $(psxconfig01_LDLIBS)
-
-psxconfig01$(EXEEXT): $(psxconfig01_OBJECTS) \
-    $(psxconfig01_DEPENDENCIES)
-	@rm -f psxconfig01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxdevctl01/Makefile.am b/testsuites/psxtests/psxdevctl01/Makefile.am
deleted file mode 100644
index 3bc9bdc988..0000000000
--- a/testsuites/psxtests/psxdevctl01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxdevctl01
-psxdevctl01_SOURCES = main.c test.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxdevctl01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxdevctl01_OBJECTS)
-LINK_LIBS = $(psxdevctl01_LDLIBS)
-
-psxdevctl01$(EXEEXT): $(psxdevctl01_OBJECTS) \
-    $(psxdevctl01_DEPENDENCIES)
-	@rm -f psxdevctl01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxeintr_join/Makefile.am b/testsuites/psxtests/psxeintr_join/Makefile.am
deleted file mode 100644
index 4d824d324a..0000000000
--- a/testsuites/psxtests/psxeintr_join/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-rtems_tests_PROGRAMS = psxeintr_join
-psxeintr_join_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxeintr_join.scn
-dist_rtems_tests_DATA += psxeintr_join.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxeintr_join_OBJECTS)
-LINK_LIBS = $(psxeintr_join_LDLIBS)
-
-psxeintr_join$(EXEEXT): $(psxeintr_join_OBJECTS) $(psxeintr_join_DEPENDENCIES)
-	@rm -f psxeintr_join$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxenosys/Makefile.am b/testsuites/psxtests/psxenosys/Makefile.am
deleted file mode 100644
index f780389c6b..0000000000
--- a/testsuites/psxtests/psxenosys/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxenosys
-psxenosys_SOURCES = init.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxenosys.scn
-dist_rtems_tests_DATA += psxenosys.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxenosys_OBJECTS)
-LINK_LIBS = $(psxenosys_LDLIBS)
-
-psxenosys$(EXEEXT): $(psxenosys_OBJECTS) $(psxenosys_DEPENDENCIES)
-	@rm -f psxenosys$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxfatal01/Makefile.am b/testsuites/psxtests/psxfatal01/Makefile.am
deleted file mode 100644
index 1444b56e90..0000000000
--- a/testsuites/psxtests/psxfatal01/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = psxfatal01
-psxfatal01_SOURCES = ../psxfatal_support/init.c ../psxfatal_support/system.h testcase.h
-
-dist_rtems_tests_DATA = psxfatal01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxfatal01_OBJECTS)
-LINK_LIBS = $(psxfatal01_LDLIBS)
-
-psxfatal01$(EXEEXT): $(psxfatal01_OBJECTS) $(psxfatal01_DEPENDENCIES)
-	@rm -f psxfatal01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxfatal02/Makefile.am b/testsuites/psxtests/psxfatal02/Makefile.am
deleted file mode 100644
index da6011a440..0000000000
--- a/testsuites/psxtests/psxfatal02/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = psxfatal02
-psxfatal02_SOURCES = ../psxfatal_support/init.c ../psxfatal_support/system.h testcase.h
-
-dist_rtems_tests_DATA = psxfatal02.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxfatal02_OBJECTS)
-LINK_LIBS = $(psxfatal02_LDLIBS)
-
-psxfatal02$(EXEEXT): $(psxfatal02_OBJECTS) $(psxfatal02_DEPENDENCIES)
-	@rm -f psxfatal02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxfchx01/Makefile.am b/testsuites/psxtests/psxfchx01/Makefile.am
deleted file mode 100644
index f8ab769690..0000000000
--- a/testsuites/psxtests/psxfchx01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxfchx01
-psxfchx01_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxfchx01.scn
-dist_rtems_tests_DATA += psxfchx01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxfchx01_OBJECTS)
-LINK_LIBS = $(psxfchx01_LDLIBS)
-
-psxfchx01$(EXEEXT): $(psxfchx01_OBJECTS) $(psxfchx01_DEPENDENCIES)
-	@rm -f psxfchx01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxfile01/Makefile.am b/testsuites/psxtests/psxfile01/Makefile.am
deleted file mode 100644
index a434b1c7e7..0000000000
--- a/testsuites/psxtests/psxfile01/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-rtems_tests_PROGRAMS = psxfile01
-psxfile01_SOURCES = main.c test.c test_cat.c test_extend.c test_write.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxfile01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxfile01_OBJECTS)
-LINK_LIBS = $(psxfile01_LDLIBS)
-
-psxfile01$(EXEEXT): $(psxfile01_OBJECTS) $(psxfile01_DEPENDENCIES)
-	@rm -f psxfile01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxfile02/Makefile.am b/testsuites/psxtests/psxfile02/Makefile.am
deleted file mode 100644
index f81adcb033..0000000000
--- a/testsuites/psxtests/psxfile02/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = psxfile02
-psxfile02_SOURCES = init.c ../../support/src/spin.c
-
-dist_rtems_tests_DATA = psxfile02.scn
-dist_rtems_tests_DATA += psxfile02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxfile02_OBJECTS)
-LINK_LIBS = $(psxfile02_LDLIBS)
-
-psxfile02$(EXEEXT): $(psxfile02_OBJECTS) $(psxfile02_DEPENDENCIES)
-	@rm -f psxfile02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxfilelock01/Makefile.am b/testsuites/psxtests/psxfilelock01/Makefile.am
deleted file mode 100644
index b07f229140..0000000000
--- a/testsuites/psxtests/psxfilelock01/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = psxfilelock01
-psxfilelock01_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxfilelock01.scn
-dist_rtems_tests_DATA += psxfilelock01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxfilelock01_OBJECTS)
-LINK_LIBS = $(psxfilelock01_LDLIBS)
-
-psxfilelock01$(EXEEXT): $(psxfilelock01_OBJECTS) $(psxfilelock01_DEPENDENCIES)
-	@rm -f psxfilelock01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxgetattrnp01/Makefile.am b/testsuites/psxtests/psxgetattrnp01/Makefile.am
deleted file mode 100644
index 82569d8f05..0000000000
--- a/testsuites/psxtests/psxgetattrnp01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxgetattrnp01
-psxgetattrnp01_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxgetattrnp01.scn
-dist_rtems_tests_DATA += psxgetattrnp01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxgetattrnp01_OBJECTS)
-LINK_LIBS = $(psxgetattrnp01_LDLIBS)
-
-psxgetattrnp01$(EXEEXT): $(psxgetattrnp01_OBJECTS) $(psxgetattrnp01_DEPENDENCIES)
-	@rm -f psxgetattrnp01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxgetrusage01/Makefile.am b/testsuites/psxtests/psxgetrusage01/Makefile.am
deleted file mode 100644
index 6d2172f53d..0000000000
--- a/testsuites/psxtests/psxgetrusage01/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = psxgetrusage01
-psxgetrusage01_SOURCES = init.c ../../support/src/spin.c
-
-dist_rtems_tests_DATA = psxgetrusage01.scn
-dist_rtems_tests_DATA += psxgetrusage01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxgetrusage01_OBJECTS)
-LINK_LIBS = $(psxgetrusage01_LDLIBS)
-
-psxgetrusage01$(EXEEXT): $(psxgetrusage01_OBJECTS) $(psxgetrusage01_DEPENDENCIES)
-	@rm -f psxgetrusage01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxglobalcon01/Makefile.am b/testsuites/psxtests/psxglobalcon01/Makefile.am
deleted file mode 100644
index 3b87ebe013..0000000000
--- a/testsuites/psxtests/psxglobalcon01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = psxglobalcon01
-psxglobalcon01_SOURCES = init.cc
-
-dist_rtems_tests_DATA = psxglobalcon01.scn psxglobalcon01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxglobalcon01_OBJECTS)
-LINK_LIBS = $(psxglobalcon01_LDLIBS)
-
-psxglobalcon01$(EXEEXT): $(psxglobalcon01_OBJECTS) $(psxglobalcon01_DEPENDENCIES)
-	@rm -f psxglobalcon01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxglobalcon02/Makefile.am b/testsuites/psxtests/psxglobalcon02/Makefile.am
deleted file mode 100644
index 0d29894baa..0000000000
--- a/testsuites/psxtests/psxglobalcon02/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = psxglobalcon02
-psxglobalcon02_SOURCES = init.cc
-
-dist_rtems_tests_DATA = psxglobalcon02.scn psxglobalcon02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxglobalcon02_OBJECTS)
-LINK_LIBS = $(psxglobalcon02_LDLIBS)
-
-psxglobalcon02$(EXEEXT): $(psxglobalcon02_OBJECTS) $(psxglobalcon02_DEPENDENCIES)
-	@rm -f psxglobalcon02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxhdrs/Makefile.am b/testsuites/psxtests/psxhdrs/Makefile.am
deleted file mode 100644
index a987bf0639..0000000000
--- a/testsuites/psxtests/psxhdrs/Makefile.am
+++ /dev/null
@@ -1,182 +0,0 @@
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES =
-
-# methods in <devctl.h>
-lib_a_SOURCES += devctl/posix_devctl.c
-
-# methods in <pthread.h>
-lib_a_SOURCES += pthread/pthread_attr_destroy.c
-lib_a_SOURCES += pthread/pthread_attr_getdetachstate.c
-lib_a_SOURCES += pthread/pthread_attr_getguardsize.c
-lib_a_SOURCES += pthread/pthread_attr_getinheritsched.c
-lib_a_SOURCES += pthread/pthread_attr_getschedparam.c
-lib_a_SOURCES += pthread/pthread_attr_getschedpolicy.c
-lib_a_SOURCES += pthread/pthread_attr_getscope.c
-lib_a_SOURCES += pthread/pthread_attr_getstackaddr.c
-lib_a_SOURCES += pthread/pthread_attr_getstack.c
-lib_a_SOURCES += pthread/pthread_attr_getstacksize.c
-lib_a_SOURCES += pthread/pthread_attr_init.c
-lib_a_SOURCES += pthread/pthread_attr_setdetachstate.c
-lib_a_SOURCES += pthread/pthread_attr_setguardsize.c
-lib_a_SOURCES += pthread/pthread_attr_setinheritsched.c
-lib_a_SOURCES += pthread/pthread_attr_setschedparam.c
-lib_a_SOURCES += pthread/pthread_attr_setschedpolicy.c
-lib_a_SOURCES += pthread/pthread_attr_setscope.c
-lib_a_SOURCES += pthread/pthread_attr_setstackaddr.c
-lib_a_SOURCES += pthread/pthread_attr_setstack.c
-lib_a_SOURCES += pthread/pthread_attr_setstacksize.c
-lib_a_SOURCES += pthread/pthread_cancel.c
-lib_a_SOURCES += pthread/pthread_cleanup.c
-lib_a_SOURCES += pthread/pthread_condattr_destroy.c
-lib_a_SOURCES += pthread/pthread_condattr_getpshared.c
-lib_a_SOURCES += pthread/pthread_condattr_init.c
-lib_a_SOURCES += pthread/pthread_condattr_setpshared.c
-lib_a_SOURCES += pthread/pthread_cond_broadcast.c
-lib_a_SOURCES += pthread/pthread_cond_destroy.c
-lib_a_SOURCES += pthread/pthread_cond_init.c
-lib_a_SOURCES += pthread/pthread_cond_signal.c
-lib_a_SOURCES += pthread/pthread_cond_timedwait.c
-lib_a_SOURCES += pthread/pthread_cond_wait.c
-lib_a_SOURCES += pthread/pthread_create.c
-lib_a_SOURCES += pthread/pthread_detach.c
-lib_a_SOURCES += pthread/pthread_equal.c
-lib_a_SOURCES += pthread/pthread_exit.c
-lib_a_SOURCES += pthread/pthread_getconcurrency.c
-lib_a_SOURCES += pthread/pthread_getcpuclockid.c
-lib_a_SOURCES += pthread/pthread_getschedparam.c
-lib_a_SOURCES += pthread/pthread_getspecific.c
-lib_a_SOURCES += pthread/pthread_join.c
-lib_a_SOURCES += pthread/pthread_key_create.c
-lib_a_SOURCES += pthread/pthread_key_delete.c
-lib_a_SOURCES += pthread/pthread_mutexattr_destroy.c
-lib_a_SOURCES += pthread/pthread_mutexattr_getprioceiling.c
-lib_a_SOURCES += pthread/pthread_mutexattr_getprotocol.c
-lib_a_SOURCES += pthread/pthread_mutexattr_getpshared.c
-lib_a_SOURCES += pthread/pthread_mutexattr_init.c
-lib_a_SOURCES += pthread/pthread_mutexattr_setprioceiling.c
-lib_a_SOURCES += pthread/pthread_mutexattr_setprotocol.c
-lib_a_SOURCES += pthread/pthread_mutexattr_setpshared.c
-lib_a_SOURCES += pthread/pthread_mutex_destroy.c
-lib_a_SOURCES += pthread/pthread_mutex_getprioceiling.c
-lib_a_SOURCES += pthread/pthread_mutex_init.c
-lib_a_SOURCES += pthread/pthread_mutex_lock.c
-lib_a_SOURCES += pthread/pthread_mutex_setprioceiling.c
-lib_a_SOURCES += pthread/pthread_mutex_timedlock.c
-lib_a_SOURCES += pthread/pthread_mutex_trylock.c
-lib_a_SOURCES += pthread/pthread_mutex_unlock.c
-lib_a_SOURCES += pthread/pthread_once.c
-lib_a_SOURCES += pthread/pthread_self.c
-lib_a_SOURCES += pthread/pthread_setcancelstate.c
-lib_a_SOURCES += pthread/pthread_setcanceltype.c
-lib_a_SOURCES += pthread/pthread_setconcurrency.c
-lib_a_SOURCES += pthread/pthread_setschedparam.c
-lib_a_SOURCES += pthread/pthread_setspecific.c
-lib_a_SOURCES += pthread/pthread_testcancel.c
-# methods in <sched.h>
-lib_a_SOURCES += sched/sched_getparam.c
-lib_a_SOURCES += sched/sched_get_priority_max.c
-lib_a_SOURCES += sched/sched_get_priority_min.c
-lib_a_SOURCES += sched/sched_getscheduler.c
-lib_a_SOURCES += sched/sched_rr_get_interval.c
-lib_a_SOURCES += sched/sched_setparam.c
-lib_a_SOURCES += sched/sched_setscheduler.c
-lib_a_SOURCES += sched/sched_yield.c
-# methods in <signal.h>
-lib_a_SOURCES += signal/pthread_sigmask.c
-lib_a_SOURCES += signal/raise.c
-lib_a_SOURCES += signal/signal.c
-lib_a_SOURCES += signal/sigpending.c
-lib_a_SOURCES += signal/sigprocmask.c
-lib_a_SOURCES += signal/sigsuspend.c
-lib_a_SOURCES += signal/sigtimedwait.c
-lib_a_SOURCES += signal/sigwait.c
-lib_a_SOURCES += signal/sigwaitinfo.c
-# methods in <time.h>
-lib_a_SOURCES += time/asctime.c
-lib_a_SOURCES += time/asctime_r.c
-lib_a_SOURCES += time/clock.c
-lib_a_SOURCES += time/clock_getcpuclockid.c
-lib_a_SOURCES += time/clock_getres.c
-lib_a_SOURCES += time/clock_gettime.c
-lib_a_SOURCES += time/clock_nanosleep.c
-lib_a_SOURCES += time/clock_settime.c
-lib_a_SOURCES += time/ctime.c
-lib_a_SOURCES += time/ctime_r.c
-lib_a_SOURCES += time/difftime.c
-lib_a_SOURCES += time/gmtime.c
-lib_a_SOURCES += time/gmtime_r.c
-lib_a_SOURCES += time/localtime.c
-lib_a_SOURCES += time/localtime_r.c
-lib_a_SOURCES += time/mktime.c
-lib_a_SOURCES += time/nanosleep.c
-lib_a_SOURCES += time/strftime.c
-lib_a_SOURCES += time/time.c
-lib_a_SOURCES += time/timer_create.c
-lib_a_SOURCES += time/timer_delete.c
-lib_a_SOURCES += time/timer_getoverrun.c
-lib_a_SOURCES += time/timer_gettime.c
-lib_a_SOURCES += time/timer_settime.c
-# methods in <unistd.h>
-lib_a_SOURCES += unistd/alarm.c
-lib_a_SOURCES += unistd/fdatasync.c
-lib_a_SOURCES += unistd/fsync.c
-lib_a_SOURCES += unistd/getegid.c
-lib_a_SOURCES += unistd/geteuid.c
-lib_a_SOURCES += unistd/getgid.c
-lib_a_SOURCES += unistd/getgroups.c
-lib_a_SOURCES += unistd/getlogin.c
-lib_a_SOURCES += unistd/getlogin_r.c
-lib_a_SOURCES += unistd/getpgrp.c
-lib_a_SOURCES += unistd/getpid.c
-lib_a_SOURCES += unistd/getppid.c
-lib_a_SOURCES += unistd/getuid.c
-lib_a_SOURCES += unistd/pause.c
-lib_a_SOURCES += unistd/setgid.c
-lib_a_SOURCES += unistd/setgroups.c
-lib_a_SOURCES += unistd/setpgid.c
-lib_a_SOURCES += unistd/setsid.c
-lib_a_SOURCES += unistd/setuid.c
-lib_a_SOURCES += unistd/sleep.c
-lib_a_SOURCES += unistd/sync.c
-lib_a_SOURCES += unistd/ualarm.c
-lib_a_SOURCES += unistd/usleep.c
-
-# methods in <sys/mman.h>
-lib_a_SOURCES += sys/mman/mlockall.c
-lib_a_SOURCES += sys/mman/mlock.c
-lib_a_SOURCES += sys/mman/mmap.c
-lib_a_SOURCES += sys/mman/mprotect.c
-lib_a_SOURCES += sys/mman/msync.c
-lib_a_SOURCES += sys/mman/munlockall.c
-lib_a_SOURCES += sys/mman/munlock.c
-lib_a_SOURCES += sys/mman/munmap.c
-lib_a_SOURCES += sys/mman/posix_madvise.c
-lib_a_SOURCES += sys/mman/shm_open.c
-lib_a_SOURCES += sys/mman/shm_unlink.c
-
-if HAS_NETWORKING
-# methods in <sys/socket.h>
-lib_a_SOURCES += sys/socket/accept.c
-lib_a_SOURCES += sys/socket/bind.c
-lib_a_SOURCES += sys/socket/connect.c
-lib_a_SOURCES += sys/socket/getpeername.c
-lib_a_SOURCES += sys/socket/getsockname.c
-lib_a_SOURCES += sys/socket/getsockopt.c
-lib_a_SOURCES += sys/socket/listen.c
-lib_a_SOURCES += sys/socket/recv.c
-lib_a_SOURCES += sys/socket/recvfrom.c
-lib_a_SOURCES += sys/socket/recvmsg.c
-lib_a_SOURCES += sys/socket/send.c
-lib_a_SOURCES += sys/socket/sendmsg.c
-lib_a_SOURCES += sys/socket/sendto.c
-lib_a_SOURCES += sys/socket/setsockopt.c
-lib_a_SOURCES += sys/socket/shutdown.c
-lib_a_SOURCES += sys/socket/socket.c
-lib_a_SOURCES += sys/socket/socketpair.c
-endif
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxid01/Makefile.am b/testsuites/psxtests/psxid01/Makefile.am
deleted file mode 100644
index b00894ad3e..0000000000
--- a/testsuites/psxtests/psxid01/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = psxid01
-psxid01_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxid01.scn
-dist_rtems_tests_DATA += psxid01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxid01_OBJECTS)
-LINK_LIBS = $(psxid01_LDLIBS)
-
-psxid01$(EXEEXT): $(psxid01_OBJECTS) $(psxid01_DEPENDENCIES)
-	@rm -f psxid01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psximfs01/Makefile.am b/testsuites/psxtests/psximfs01/Makefile.am
deleted file mode 100644
index f8adfe1ee6..0000000000
--- a/testsuites/psxtests/psximfs01/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = psximfs01
-psximfs01_SOURCES = init.c
-
-dist_rtems_tests_DATA = psximfs01.scn
-dist_rtems_tests_DATA += psximfs01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psximfs01_OBJECTS)
-LINK_LIBS = $(psximfs01_LDLIBS)
-
-psximfs01$(EXEEXT): $(psximfs01_OBJECTS) $(psximfs01_DEPENDENCIES)
-	@rm -f psximfs01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psximfs02/Makefile.am b/testsuites/psxtests/psximfs02/Makefile.am
deleted file mode 100644
index a61784ea41..0000000000
--- a/testsuites/psxtests/psximfs02/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-rtems_tests_PROGRAMS = psximfs02
-psximfs02_SOURCES = init.c
-
-dist_rtems_tests_DATA = psximfs02.scn
-dist_rtems_tests_DATA += psximfs02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psximfs02_OBJECTS)
-LINK_LIBS = $(psximfs02_LDLIBS)
-
-psximfs02$(EXEEXT): $(psximfs02_OBJECTS) $(psximfs02_DEPENDENCIES)
-	@rm -f psximfs02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxintrcritical01/Makefile.am b/testsuites/psxtests/psxintrcritical01/Makefile.am
deleted file mode 100644
index 560ea8d852..0000000000
--- a/testsuites/psxtests/psxintrcritical01/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-rtems_tests_PROGRAMS = psxintrcritical01
-psxintrcritical01_SOURCES = init.c \
-    ../../sptests/spintrcritical_support/intrcritical.c
-
-dist_rtems_tests_DATA = psxintrcritical01.scn
-dist_rtems_tests_DATA += psxintrcritical01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../sptests/spintrcritical_support
-
-LINK_OBJS = $(psxintrcritical01_OBJECTS)
-LINK_LIBS = $(psxintrcritical01_LDLIBS)
-
-psxintrcritical01$(EXEEXT): $(psxintrcritical01_OBJECTS) $(psxintrcritical01_DEPENDENCIES)
-	@rm -f psxintrcritical01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxitimer/Makefile.am b/testsuites/psxtests/psxitimer/Makefile.am
deleted file mode 100644
index aa0d614f6d..0000000000
--- a/testsuites/psxtests/psxitimer/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxitimer
-psxitimer_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxitimer.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxitimer_OBJECTS)
-LINK_LIBS = $(psxitimer_LDLIBS)
-
-psxitimer$(EXEEXT): $(psxitimer_OBJECTS) $(psxitimer_DEPENDENCIES)
-	@rm -f psxitimer$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxkey01/Makefile.am b/testsuites/psxtests/psxkey01/Makefile.am
deleted file mode 100644
index e5cb1f5400..0000000000
--- a/testsuites/psxtests/psxkey01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxkey01
-psxkey01_SOURCES = init.c system.h ../include/pmacros.h \
-     ../../support/src/test_support.c
-
-dist_rtems_tests_DATA = psxkey01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxkey01_OBJECTS)
-LINK_LIBS = $(psxkey01_LDLIBS)
-
-psxkey01$(EXEEXT): $(psxkey01_OBJECTS) $(psxkey01_DEPENDENCIES)
-	@rm -f psxkey01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxkey02/Makefile.am b/testsuites/psxtests/psxkey02/Makefile.am
deleted file mode 100644
index e509917f8c..0000000000
--- a/testsuites/psxtests/psxkey02/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxkey02
-psxkey02_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxkey02.scn
-dist_rtems_tests_DATA += psxkey02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxkey02_OBJECTS)
-LINK_LIBS = $(psxkey02_LDLIBS)
-
-psxkey02$(EXEEXT): $(psxkey02_OBJECTS) $(psxkey02_DEPENDENCIES)
-	@rm -f psxkey02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxkey03/Makefile.am b/testsuites/psxtests/psxkey03/Makefile.am
deleted file mode 100644
index 2dc6d1442d..0000000000
--- a/testsuites/psxtests/psxkey03/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxkey03
-psxkey03_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxkey03.scn
-dist_rtems_tests_DATA += psxkey03.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxkey03_OBJECTS)
-LINK_LIBS = $(psxkey03_LDLIBS)
-
-psxkey03$(EXEEXT): $(psxkey03_OBJECTS) $(psxkey03_DEPENDENCIES)
-	@rm -f psxkey03$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxkey04/Makefile.am b/testsuites/psxtests/psxkey04/Makefile.am
deleted file mode 100644
index cd5f2bb8c1..0000000000
--- a/testsuites/psxtests/psxkey04/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxkey04
-psxkey04_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxkey04.scn
-dist_rtems_tests_DATA += psxkey04.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxkey04_OBJECTS)
-LINK_LIBS = $(psxkey04_LDLIBS)
-
-psxkey04$(EXEEXT): $(psxkey04_OBJECTS) $(psxkey04_DEPENDENCIES)
-	@rm -f psxkey04$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxkey05/Makefile.am b/testsuites/psxtests/psxkey05/Makefile.am
deleted file mode 100644
index c253900c06..0000000000
--- a/testsuites/psxtests/psxkey05/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxkey05
-psxkey05_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxkey05.scn
-dist_rtems_tests_DATA += psxkey05.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxkey05_OBJECTS)
-LINK_LIBS = $(psxkey05_LDLIBS)
-
-psxkey05$(EXEEXT): $(psxkey05_OBJECTS) $(psxkey05_DEPENDENCIES)
-	@rm -f psxkey05$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxkey06/Makefile.am b/testsuites/psxtests/psxkey06/Makefile.am
deleted file mode 100644
index 9815baf4eb..0000000000
--- a/testsuites/psxtests/psxkey06/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxkey06
-psxkey06_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxkey06.scn
-dist_rtems_tests_DATA += psxkey06.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxkey06_OBJECTS)
-LINK_LIBS = $(psxkey06_LDLIBS)
-
-psxkey06$(EXEEXT): $(psxkey06_OBJECTS) $(psxkey06_DEPENDENCIES)
-	@rm -f psxkey06$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxkey07/Makefile.am b/testsuites/psxtests/psxkey07/Makefile.am
deleted file mode 100644
index a701f309b2..0000000000
--- a/testsuites/psxtests/psxkey07/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxkey07
-psxkey07_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxkey07.scn
-dist_rtems_tests_DATA += psxkey07.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxkey07_OBJECTS)
-LINK_LIBS = $(psxkey07_LDLIBS)
-
-psxkey07$(EXEEXT): $(psxkey07_OBJECTS) $(psxkey07_DEPENDENCIES)
-	@rm -f psxkey07$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxkey08/Makefile.am b/testsuites/psxtests/psxkey08/Makefile.am
deleted file mode 100644
index e5bf7873ee..0000000000
--- a/testsuites/psxtests/psxkey08/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxkey08
-psxkey08_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxkey08.scn
-dist_rtems_tests_DATA += psxkey08.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxkey08_OBJECTS)
-LINK_LIBS = $(psxkey08_LDLIBS)
-
-psxkey08$(EXEEXT): $(psxkey08_OBJECTS) $(psxkey08_DEPENDENCIES)
-	@rm -f psxkey08$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxkey09/Makefile.am b/testsuites/psxtests/psxkey09/Makefile.am
deleted file mode 100644
index ed3ee0045d..0000000000
--- a/testsuites/psxtests/psxkey09/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxkey09
-psxkey09_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxkey09.scn
-dist_rtems_tests_DATA += psxkey09.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxkey09_OBJECTS)
-LINK_LIBS = $(psxkey09_LDLIBS)
-
-psxkey09$(EXEEXT): $(psxkey09_OBJECTS) $(psxkey09_DEPENDENCIES)
-	@rm -f psxkey09$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxkey10/Makefile.am b/testsuites/psxtests/psxkey10/Makefile.am
deleted file mode 100644
index 8e4f2f409b..0000000000
--- a/testsuites/psxtests/psxkey10/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxkey10
-psxkey10_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxkey10.scn
-dist_rtems_tests_DATA += psxkey10.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxkey10_OBJECTS)
-LINK_LIBS = $(psxkey10_LDLIBS)
-
-psxkey10$(EXEEXT): $(psxkey10_OBJECTS) $(psxkey10_DEPENDENCIES)
-	@rm -f psxkey10$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxmmap01/Makefile.am b/testsuites/psxtests/psxmmap01/Makefile.am
deleted file mode 100644
index 57b008719e..0000000000
--- a/testsuites/psxtests/psxmmap01/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxmmap01
-psxmmap01_SOURCES = init.c test_helper.c test_driver.c system.h
-
-dist_rtems_tests_DATA = psxmmap01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxmmap01_OBJECTS)
-LINK_LIBS = $(psxmmap01_LDLIBS)
-
-psxmmap01$(EXEEXT): $(psxmmap01_OBJECTS) $(psxmmap01_DEPENDENCIES)
-	@rm -f psxmmap01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxmount/Makefile.am b/testsuites/psxtests/psxmount/Makefile.am
deleted file mode 100644
index d4ff1ebe3c..0000000000
--- a/testsuites/psxtests/psxmount/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxmount
-psxmount_SOURCES = main.c test.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxmount.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxmount_OBJECTS)
-LINK_LIBS = $(psxmount_LDLIBS)
-
-psxmount$(EXEEXT): $(psxmount_OBJECTS) $(psxmount_DEPENDENCIES)
-	@rm -f psxmount$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxmsgq01/Makefile.am b/testsuites/psxtests/psxmsgq01/Makefile.am
deleted file mode 100644
index 4cdcf888f0..0000000000
--- a/testsuites/psxtests/psxmsgq01/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-rtems_tests_PROGRAMS = psxmsgq01
-psxmsgq01_SOURCES = init.c system.h ../include/pmacros.h \
-     ../../support/src/test_support.c
-
-
-dist_rtems_tests_DATA = psxmsgq01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxmsgq01_OBJECTS)
-LINK_LIBS = $(psxmsgq01_LDLIBS)
-
-psxmsgq01$(EXEEXT): $(psxmsgq01_OBJECTS) $(psxmsgq01_DEPENDENCIES)
-	@rm -f psxmsgq01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxmsgq02/Makefile.am b/testsuites/psxtests/psxmsgq02/Makefile.am
deleted file mode 100644
index 19360e0c78..0000000000
--- a/testsuites/psxtests/psxmsgq02/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxmsgq02
-psxmsgq02_SOURCES = init.c system.h ../include/pmacros.h \
-     ../../support/src/test_support.c
-
-dist_rtems_tests_DATA = psxmsgq02.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxmsgq02_OBJECTS)
-LINK_LIBS = $(psxmsgq02_LDLIBS)
-
-psxmsgq02$(EXEEXT): $(psxmsgq02_OBJECTS) $(psxmsgq02_DEPENDENCIES)
-	@rm -f psxmsgq02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxmsgq03/Makefile.am b/testsuites/psxtests/psxmsgq03/Makefile.am
deleted file mode 100644
index af100529e0..0000000000
--- a/testsuites/psxtests/psxmsgq03/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-rtems_tests_PROGRAMS = psxmsgq03
-psxmsgq03_SOURCES = init.c system.h ../include/pmacros.h \
-     ../../support/src/test_support.c
-
-dist_rtems_tests_DATA = psxmsgq03.scn
-dist_rtems_tests_DATA += psxmsgq03.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxmsgq03_OBJECTS)
-LINK_LIBS = $(psxmsgq03_LDLIBS)
-
-psxmsgq03$(EXEEXT): $(psxmsgq03_OBJECTS) $(psxmsgq03_DEPENDENCIES)
-	@rm -f psxmsgq03$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxmsgq04/Makefile.am b/testsuites/psxtests/psxmsgq04/Makefile.am
deleted file mode 100644
index 50ba3f4b77..0000000000
--- a/testsuites/psxtests/psxmsgq04/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-rtems_tests_PROGRAMS = psxmsgq04
-psxmsgq04_SOURCES = init.c ../include/pmacros.h \
-     ../../support/src/test_support.c
-
-dist_rtems_tests_DATA = psxmsgq04.scn
-dist_rtems_tests_DATA += psxmsgq04.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxmsgq04_OBJECTS)
-LINK_LIBS = $(psxmsgq04_LDLIBS)
-
-psxmsgq04$(EXEEXT): $(psxmsgq04_OBJECTS) $(psxmsgq04_DEPENDENCIES)
-	@rm -f psxmsgq04$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxmutexattr01/Makefile.am b/testsuites/psxtests/psxmutexattr01/Makefile.am
deleted file mode 100644
index f5ece31089..0000000000
--- a/testsuites/psxtests/psxmutexattr01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxmutexattr01
-psxmutexattr01_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxmutexattr01.scn
-dist_rtems_tests_DATA += psxmutexattr01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxmutexattr01_OBJECTS)
-LINK_LIBS = $(psxmutexattr01_LDLIBS)
-
-psxmutexattr01$(EXEEXT): $(psxmutexattr01_OBJECTS) $(psxmutexattr01_DEPENDENCIES)
-	@rm -f psxmutexattr01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxobj01/Makefile.am b/testsuites/psxtests/psxobj01/Makefile.am
deleted file mode 100644
index 4393e68f5b..0000000000
--- a/testsuites/psxtests/psxobj01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxobj01
-psxobj01_SOURCES = init.c ../../support/src/test_support.c
-
-dist_rtems_tests_DATA = psxobj01.scn
-dist_rtems_tests_DATA += psxobj01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxobj01_OBJECTS)
-LINK_LIBS = $(psxobj01_LDLIBS)
-
-psxobj01$(EXEEXT): $(psxobj01_OBJECTS) $(psxobj01_DEPENDENCIES)
-	@rm -f psxobj01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxonce01/Makefile.am b/testsuites/psxtests/psxonce01/Makefile.am
deleted file mode 100644
index bb11fe178b..0000000000
--- a/testsuites/psxtests/psxonce01/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxonce01
-psxonce01_SOURCES = init.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxonce01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxonce01_OBJECTS)
-LINK_LIBS = $(psxonce01_LDLIBS)
-
-psxonce01$(EXEEXT): $(psxonce01_OBJECTS) $(psxonce01_DEPENDENCIES)
-	@rm -f psxonce01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxpasswd01/Makefile.am b/testsuites/psxtests/psxpasswd01/Makefile.am
deleted file mode 100644
index b001c5fcfa..0000000000
--- a/testsuites/psxtests/psxpasswd01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxpasswd01
-psxpasswd01_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxpasswd01.scn
-dist_rtems_tests_DATA += psxpasswd01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxpasswd01_OBJECTS)
-LINK_LIBS = $(psxpasswd01_LDLIBS)
-
-psxpasswd01$(EXEEXT): $(psxpasswd01_OBJECTS) $(psxpasswd01_DEPENDENCIES)
-	@rm -f psxpasswd01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxpasswd02/Makefile.am b/testsuites/psxtests/psxpasswd02/Makefile.am
deleted file mode 100644
index 08fe8b92ea..0000000000
--- a/testsuites/psxtests/psxpasswd02/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxpasswd02
-psxpasswd02_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxpasswd02.scn
-dist_rtems_tests_DATA += psxpasswd02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxpasswd02_OBJECTS)
-LINK_LIBS = $(psxpasswd02_LDLIBS)
-
-psxpasswd02$(EXEEXT): $(psxpasswd02_OBJECTS) $(psxpasswd02_DEPENDENCIES)
-	@rm -f psxpasswd02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxpipe01/Makefile.am b/testsuites/psxtests/psxpipe01/Makefile.am
deleted file mode 100644
index a942ed7909..0000000000
--- a/testsuites/psxtests/psxpipe01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxpipe01
-psxpipe01_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxpipe01.scn
-dist_rtems_tests_DATA += psxpipe01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxpipe01_OBJECTS)
-LINK_LIBS = $(psxpipe01_LDLIBS)
-
-psxpipe01$(EXEEXT): $(psxpipe01_OBJECTS) $(psxpipe01_DEPENDENCIES)
-	@rm -f psxpipe01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxrdwrv/Makefile.am b/testsuites/psxtests/psxrdwrv/Makefile.am
deleted file mode 100644
index 538a58e7c7..0000000000
--- a/testsuites/psxtests/psxrdwrv/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxrdwrv
-psxrdwrv_SOURCES = main.c test.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxrdwrv.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxrdwrv_OBJECTS)
-LINK_LIBS = $(psxrdwrv_LDLIBS)
-
-psxrdwrv$(EXEEXT): $(psxrdwrv_OBJECTS) $(psxrdwrv_DEPENDENCIES)
-	@rm -f psxrdwrv$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxreaddir/Makefile.am b/testsuites/psxtests/psxreaddir/Makefile.am
deleted file mode 100644
index 66e6c00fab..0000000000
--- a/testsuites/psxtests/psxreaddir/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxreaddir
-psxreaddir_SOURCES = main.c test.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxreaddir.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxreaddir_OBJECTS)
-LINK_LIBS = $(psxreaddir_LDLIBS)
-
-psxreaddir$(EXEEXT): $(psxreaddir_OBJECTS) $(psxreaddir_DEPENDENCIES)
-	@rm -f psxreaddir$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxrwlock01/Makefile.am b/testsuites/psxtests/psxrwlock01/Makefile.am
deleted file mode 100644
index 8e7cbd94dc..0000000000
--- a/testsuites/psxtests/psxrwlock01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxrwlock01
-psxrwlock01_SOURCES = main.c test.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxrwlock01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxrwlock01_OBJECTS)
-LINK_LIBS = $(psxrwlock01_LDLIBS)
-
-psxrwlock01$(EXEEXT): $(psxrwlock01_OBJECTS) \
-    $(psxrwlock01_DEPENDENCIES)
-	@rm -f psxrwlock01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxsem01/Makefile.am b/testsuites/psxtests/psxsem01/Makefile.am
deleted file mode 100644
index 095bbfab78..0000000000
--- a/testsuites/psxtests/psxsem01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxsem01
-psxsem01_SOURCES = init.c ../include/pmacros.h \
-     ../../support/src/test_support.c
-
-dist_rtems_tests_DATA = psxsem01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxsem01_OBJECTS)
-LINK_LIBS = $(psxsem01_LDLIBS)
-
-psxsem01$(EXEEXT): $(psxsem01_OBJECTS) $(psxsem01_DEPENDENCIES)
-	@rm -f psxsem01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxshm01/Makefile.am b/testsuites/psxtests/psxshm01/Makefile.am
deleted file mode 100644
index 7082a50167..0000000000
--- a/testsuites/psxtests/psxshm01/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxshm01
-psxshm01_SOURCES = init.c system.h
-
-dist_rtems_tests_DATA = psxshm01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxshm01_OBJECTS)
-LINK_LIBS = $(psxshm01_LDLIBS)
-
-psxshm01$(EXEEXT): $(psxshm01_OBJECTS) $(psxshm01_DEPENDENCIES)
-	@rm -f psxshm01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxshm02/Makefile.am b/testsuites/psxtests/psxshm02/Makefile.am
deleted file mode 100644
index c174b0ccf5..0000000000
--- a/testsuites/psxtests/psxshm02/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxshm02
-psxshm02_SOURCES = init.c system.h
-
-dist_rtems_tests_DATA = psxshm02.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxshm02_OBJECTS)
-LINK_LIBS = $(psxshm02_LDLIBS)
-
-psxshm02$(EXEEXT): $(psxshm02_OBJECTS) $(psxshm02_DEPENDENCIES)
-	@rm -f psxshm02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxsignal01/Makefile.am b/testsuites/psxtests/psxsignal01/Makefile.am
deleted file mode 100644
index 006b57cc9b..0000000000
--- a/testsuites/psxtests/psxsignal01/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxsignal01
-psxsignal01_SOURCES = init.c task1.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxsignal01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxsignal01_OBJECTS)
-LINK_LIBS = $(psxsignal01_LDLIBS)
-
-psxsignal01$(EXEEXT): $(psxsignal01_OBJECTS) $(psxsignal01_DEPENDENCIES)
-	@rm -f psxsignal01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxsignal02/Makefile.am b/testsuites/psxtests/psxsignal02/Makefile.am
deleted file mode 100644
index 2f8302e202..0000000000
--- a/testsuites/psxtests/psxsignal02/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxsignal02
-psxsignal02_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxsignal02.scn
-dist_rtems_tests_DATA += psxsignal02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxsignal02_OBJECTS)
-LINK_LIBS = $(psxsignal02_LDLIBS)
-
-psxsignal02$(EXEEXT): $(psxsignal02_OBJECTS) $(psxsignal02_DEPENDENCIES)
-	@rm -f psxsignal02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxsignal03/Makefile.am b/testsuites/psxtests/psxsignal03/Makefile.am
deleted file mode 100644
index c89f6eb7c6..0000000000
--- a/testsuites/psxtests/psxsignal03/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-rtems_tests_PROGRAMS = psxsignal03
-psxsignal03_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxsignal03.scn
-dist_rtems_tests_DATA += psxsignal03.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DUSE_USER_SIGNALS_PROCESS
-
-LINK_OBJS = $(psxsignal03_OBJECTS)
-LINK_LIBS = $(psxsignal03_LDLIBS)
-
-psxsignal03$(EXEEXT): $(psxsignal03_OBJECTS) $(psxsignal03_DEPENDENCIES)
-	@rm -f psxsignal03$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxsignal04/Makefile.am b/testsuites/psxtests/psxsignal04/Makefile.am
deleted file mode 100644
index 0e26c48060..0000000000
--- a/testsuites/psxtests/psxsignal04/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-rtems_tests_PROGRAMS = psxsignal04
-psxsignal04_SOURCES = ../psxsignal03/init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxsignal04.scn
-dist_rtems_tests_DATA += psxsignal04.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -DUSE_REAL_TIME_SIGNALS_PROCESS
-
-LINK_OBJS = $(psxsignal04_OBJECTS)
-LINK_LIBS = $(psxsignal04_LDLIBS)
-
-psxsignal04$(EXEEXT): $(psxsignal04_OBJECTS) $(psxsignal04_DEPENDENCIES)
-	@rm -f psxsignal04$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxsignal05/Makefile.am b/testsuites/psxtests/psxsignal05/Makefile.am
deleted file mode 100644
index f9ad75615c..0000000000
--- a/testsuites/psxtests/psxsignal05/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxsignal05
-psxsignal05_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxsignal05.scn
-dist_rtems_tests_DATA += psxsignal05.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxsignal05_OBJECTS)
-LINK_LIBS = $(psxsignal05_LDLIBS)
-
-psxsignal05$(EXEEXT): $(psxsignal05_OBJECTS) $(psxsignal05_DEPENDENCIES)
-	@rm -f psxsignal05$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxsignal06/Makefile.am b/testsuites/psxtests/psxsignal06/Makefile.am
deleted file mode 100644
index d3e27873c1..0000000000
--- a/testsuites/psxtests/psxsignal06/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-rtems_tests_PROGRAMS = psxsignal06
-psxsignal06_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxsignal06.scn
-dist_rtems_tests_DATA += psxsignal06.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxsignal06_OBJECTS)
-LINK_LIBS = $(psxsignal06_LDLIBS)
-
-psxsignal06$(EXEEXT): $(psxsignal06_OBJECTS) $(psxsignal06_DEPENDENCIES)
-	@rm -f psxsignal06$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxspin01/Makefile.am b/testsuites/psxtests/psxspin01/Makefile.am
deleted file mode 100644
index 6d6d44fee6..0000000000
--- a/testsuites/psxtests/psxspin01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxspin01
-psxspin01_SOURCES = main.c test.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxspin01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxspin01_OBJECTS)
-LINK_LIBS = $(psxspin01_LDLIBS)
-
-psxspin01$(EXEEXT): $(psxspin01_OBJECTS) \
-    $(psxspin01_DEPENDENCIES)
-	@rm -f psxspin01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxstack01/Makefile.am b/testsuites/psxtests/psxstack01/Makefile.am
deleted file mode 100644
index 0e2ae14205..0000000000
--- a/testsuites/psxtests/psxstack01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxstack01
-psxstack01_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxstack01.scn
-dist_rtems_tests_DATA += psxstack01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxstack01_OBJECTS)
-LINK_LIBS = $(psxstack01_LDLIBS)
-
-psxstack01$(EXEEXT): $(psxstack01_OBJECTS) $(psxstack01_DEPENDENCIES)
-	@rm -f psxstack01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxstack02/Makefile.am b/testsuites/psxtests/psxstack02/Makefile.am
deleted file mode 100644
index 05b4495b96..0000000000
--- a/testsuites/psxtests/psxstack02/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-rtems_tests_PROGRAMS = psxstack02
-psxstack02_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxstack02.scn
-dist_rtems_tests_DATA += psxstack02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxstack02_OBJECTS)
-LINK_LIBS = $(psxstack02_LDLIBS)
-
-psxstack02$(EXEEXT): $(psxstack02_OBJECTS) $(psxstack02_DEPENDENCIES)
-	@rm -f psxstack02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxstat/Makefile.am b/testsuites/psxtests/psxstat/Makefile.am
deleted file mode 100644
index 00e2bbc025..0000000000
--- a/testsuites/psxtests/psxstat/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxstat
-psxstat_SOURCES = main.c test.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxstat.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxstat_OBJECTS)
-LINK_LIBS = $(psxstat_LDLIBS)
-
-psxstat$(EXEEXT): $(psxstat_OBJECTS) $(psxstat_DEPENDENCIES)
-	@rm -f psxstat$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxstrsignal01/Makefile.am b/testsuites/psxtests/psxstrsignal01/Makefile.am
deleted file mode 100644
index f35399904e..0000000000
--- a/testsuites/psxtests/psxstrsignal01/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-rtems_tests_PROGRAMS = psxstrsignal01
-psxstrsignal01_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxstrsignal01.scn
-dist_rtems_tests_DATA += psxstrsignal01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxstrsignal01_OBJECTS)
-LINK_LIBS = $(psxstrsignal01_LDLIBS)
-
-psxstrsignal01$(EXEEXT): $(psxstrsignal01_OBJECTS) \
-    $(psxstrsignal01_DEPENDENCIES)
-	@rm -f psxstrsignal01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxsysconf/Makefile.am b/testsuites/psxtests/psxsysconf/Makefile.am
deleted file mode 100644
index bd2b9ce807..0000000000
--- a/testsuites/psxtests/psxsysconf/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxsysconf
-psxsysconf_SOURCES = init.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxsysconf.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxsysconf_OBJECTS)
-LINK_LIBS = $(psxsysconf_LDLIBS)
-
-psxsysconf$(EXEEXT): $(psxsysconf_OBJECTS) $(psxsysconf_DEPENDENCIES)
-	@rm -f psxsysconf$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxthreadname01/Makefile.am b/testsuites/psxtests/psxthreadname01/Makefile.am
deleted file mode 100644
index 8726803b48..0000000000
--- a/testsuites/psxtests/psxthreadname01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = psxthreadname01
-psxthreadname01_SOURCES = init.c
-
-dist_rtems_tests_DATA = psxthreadname01.scn psxthreadname01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxthreadname01_OBJECTS)
-LINK_LIBS = $(psxthreadname01_LDLIBS)
-
-psxthreadname01$(EXEEXT): $(psxthreadname01_OBJECTS) $(psxthreadname01_DEPENDENCIES)
-	@rm -f psxthreadname01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxtime/Makefile.am b/testsuites/psxtests/psxtime/Makefile.am
deleted file mode 100644
index 7d41a75226..0000000000
--- a/testsuites/psxtests/psxtime/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = psxtime
-psxtime_SOURCES = main.c test.c
-
-dist_rtems_tests_DATA = psxtime.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxtime_OBJECTS)
-LINK_LIBS = $(psxtime_LDLIBS)
-
-psxtime$(EXEEXT): $(psxtime_OBJECTS) $(psxtime_DEPENDENCIES)
-	@rm -f psxtime$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxtimer01/Makefile.am b/testsuites/psxtests/psxtimer01/Makefile.am
deleted file mode 100644
index 35d57ee105..0000000000
--- a/testsuites/psxtests/psxtimer01/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxtimer01
-psxtimer01_SOURCES = psxtimer.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxtimer01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxtimer01_OBJECTS)
-LINK_LIBS = $(psxtimer01_LDLIBS)
-
-psxtimer01$(EXEEXT): $(psxtimer01_OBJECTS) $(psxtimer01_DEPENDENCIES)
-	@rm -f psxtimer01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxtimer02/Makefile.am b/testsuites/psxtests/psxtimer02/Makefile.am
deleted file mode 100644
index e8b53a3a6d..0000000000
--- a/testsuites/psxtests/psxtimer02/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxtimer02
-psxtimer02_SOURCES = psxtimer.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxtimer02.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxtimer02_OBJECTS)
-LINK_LIBS = $(psxtimer02_LDLIBS)
-
-psxtimer02$(EXEEXT): $(psxtimer02_OBJECTS) $(psxtimer02_DEPENDENCIES)
-	@rm -f psxtimer02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxtimes01/Makefile.am b/testsuites/psxtests/psxtimes01/Makefile.am
deleted file mode 100644
index 3c2185e73d..0000000000
--- a/testsuites/psxtests/psxtimes01/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-rtems_tests_PROGRAMS = psxtimes01
-psxtimes01_SOURCES = init.c ../../support/src/spin.c
-
-dist_rtems_tests_DATA = psxtimes01.scn
-dist_rtems_tests_DATA += psxtimes01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxtimes01_OBJECTS)
-LINK_LIBS = $(psxtimes01_LDLIBS)
-
-psxtimes01$(EXEEXT): $(psxtimes01_OBJECTS) $(psxtimes01_DEPENDENCIES)
-	@rm -f psxtimes01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxualarm/Makefile.am b/testsuites/psxtests/psxualarm/Makefile.am
deleted file mode 100644
index 4f3eca79b2..0000000000
--- a/testsuites/psxtests/psxualarm/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = psxualarm
-psxualarm_SOURCES = init.c system.h ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxualarm.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxualarm_OBJECTS)
-LINK_LIBS = $(psxulaarm_LDLIBS)
-
-psxualarm$(EXEEXT): $(psxualarm_OBJECTS) $(psxualarm_DEPENDENCIES)
-	@rm -f psxualarm$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/psxtests/psxusleep/Makefile.am b/testsuites/psxtests/psxusleep/Makefile.am
deleted file mode 100644
index 2b6ea572fa..0000000000
--- a/testsuites/psxtests/psxusleep/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = psxusleep
-psxusleep_SOURCES = init.c ../include/pmacros.h
-
-dist_rtems_tests_DATA = psxusleep.scn
-dist_rtems_tests_DATA += psxusleep.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP at .cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(psxusleep_OBJECTS)
-LINK_LIBS = $(psxusleep_LDLIBS)
-
-psxusleep$(EXEEXT): $(psxusleep_OBJECTS) $(psxusleep_DEPENDENCIES)
-	@rm -f psxusleep$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
-- 
2.15.1


