From 5c65b9881bec47e322607a9a63c83d1a229c1710 Mon Sep 17 00:00:00 2001
From: Chris Johns <chrisj@rtems.org>
Date: Mon, 9 Apr 2018 13:39:19 +1000
Subject: testsuite/libtests: Merged nested Makefile.am files into one
 Makefile.am

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

Update #3382
---
 testsuites/libtests/Makefile.am                 | 1331 +++++++++++++++++++++--
 testsuites/libtests/POSIX/Makefile.am           |  149 ---
 testsuites/libtests/block01/Makefile.am         |   21 -
 testsuites/libtests/block02/Makefile.am         |   21 -
 testsuites/libtests/block03/Makefile.am         |   21 -
 testsuites/libtests/block04/Makefile.am         |   21 -
 testsuites/libtests/block05/Makefile.am         |   21 -
 testsuites/libtests/block06/Makefile.am         |   21 -
 testsuites/libtests/block07/Makefile.am         |   21 -
 testsuites/libtests/block08/Makefile.am         |   47 -
 testsuites/libtests/block09/Makefile.am         |   21 -
 testsuites/libtests/block10/Makefile.am         |   21 -
 testsuites/libtests/block11/Makefile.am         |   21 -
 testsuites/libtests/block12/Makefile.am         |   19 -
 testsuites/libtests/block13/Makefile.am         |   19 -
 testsuites/libtests/block14/Makefile.am         |   19 -
 testsuites/libtests/block15/Makefile.am         |   19 -
 testsuites/libtests/block16/Makefile.am         |   19 -
 testsuites/libtests/block17/Makefile.am         |   19 -
 testsuites/libtests/bspcmdline01/Makefile.am    |   22 -
 testsuites/libtests/capture01/Makefile.am       |   21 -
 testsuites/libtests/complex/Makefile.am         |   28 -
 testsuites/libtests/configure.ac                |  231 ++--
 testsuites/libtests/cpuuse/Makefile.am          |   21 -
 testsuites/libtests/crypt01/Makefile.am         |   19 -
 testsuites/libtests/debugger01/Makefile.am      |   21 -
 testsuites/libtests/defaultconfig01/Makefile.am |   19 -
 testsuites/libtests/devfs01/Makefile.am         |   21 -
 testsuites/libtests/devfs02/Makefile.am         |   20 -
 testsuites/libtests/devfs03/Makefile.am         |   20 -
 testsuites/libtests/devfs04/Makefile.am         |   21 -
 testsuites/libtests/deviceio01/Makefile.am      |   21 -
 testsuites/libtests/devnullfatal01/Makefile.am  |   24 -
 testsuites/libtests/dl01/Makefile.am            |   46 -
 testsuites/libtests/dl01/init.c                 |    6 +-
 testsuites/libtests/dl02/Makefile.am            |   48 -
 testsuites/libtests/dl02/init.c                 |    6 +-
 testsuites/libtests/dl03/Makefile.am            |   19 -
 testsuites/libtests/dl04/Makefile.am            |   47 -
 testsuites/libtests/dl04/init.c                 |    6 +-
 testsuites/libtests/dl05/Makefile.am            |   47 -
 testsuites/libtests/dl05/init.c                 |    6 +-
 testsuites/libtests/dumpbuf01/Makefile.am       |   21 -
 testsuites/libtests/exit01/Makefile.am          |   19 -
 testsuites/libtests/exit02/Makefile.am          |   19 -
 testsuites/libtests/flashdisk01/Makefile.am     |   19 -
 testsuites/libtests/ftp01/Makefile.am           |   23 -
 testsuites/libtests/getentropy01/Makefile.am    |   19 -
 testsuites/libtests/gxx01/Makefile.am           |   21 -
 testsuites/libtests/heapwalk/Makefile.am        |   21 -
 testsuites/libtests/i2c01/Makefile.am           |   19 -
 testsuites/libtests/libfdt01/Makefile.am        |   19 -
 testsuites/libtests/malloc02/Makefile.am        |   21 -
 testsuites/libtests/malloc03/Makefile.am        |   21 -
 testsuites/libtests/malloc04/Makefile.am        |   21 -
 testsuites/libtests/malloctest/Makefile.am      |   21 -
 testsuites/libtests/math/Makefile.am            |   22 -
 testsuites/libtests/mathf/Makefile.am           |   22 -
 testsuites/libtests/mathl/Makefile.am           |   25 -
 testsuites/libtests/md501/Makefile.am           |   19 -
 testsuites/libtests/mghttpd01/Makefile.am       |   34 -
 testsuites/libtests/mghttpd01/init.c            |    8 +-
 testsuites/libtests/mghttpd01/init_fs.tar       |  Bin 10240 -> 0 bytes
 testsuites/libtests/mghttpd01/mghttpd01.tar     |  Bin 0 -> 10240 bytes
 testsuites/libtests/monitor/Makefile.am         |   19 -
 testsuites/libtests/monitor02/Makefile.am       |   21 -
 testsuites/libtests/mouse01/Makefile.am         |   23 -
 testsuites/libtests/networking01/Makefile.am    |   22 -
 testsuites/libtests/newlib01/Makefile.am        |   19 -
 testsuites/libtests/putenvtest/Makefile.am      |   21 -
 testsuites/libtests/pwdgrp01/Makefile.am        |   19 -
 testsuites/libtests/pwdgrp02/Makefile.am        |   19 -
 testsuites/libtests/rbheap01/Makefile.am        |   19 -
 testsuites/libtests/rtmonuse/Makefile.am        |   21 -
 testsuites/libtests/sha/Makefile.am             |   19 -
 testsuites/libtests/shell01/Makefile.am         |   19 -
 testsuites/libtests/sparsedisk01/Makefile.am    |   19 -
 testsuites/libtests/spi01/Makefile.am           |   19 -
 testsuites/libtests/stackchk/Makefile.am        |   21 -
 testsuites/libtests/stackchk01/Makefile.am      |   22 -
 testsuites/libtests/stringto01/Makefile.am      |   22 -
 testsuites/libtests/syscall01/Makefile.am       |   20 -
 testsuites/libtests/tar01/Makefile.am           |  115 --
 testsuites/libtests/tar01/init.c                |   18 +-
 testsuites/libtests/tar02/Makefile.am           |   52 -
 testsuites/libtests/tar02/init.c                |    6 +-
 testsuites/libtests/tar03/Makefile.am           |   20 -
 testsuites/libtests/termios/Makefile.am         |   19 -
 testsuites/libtests/termios01/Makefile.am       |   24 -
 testsuites/libtests/termios02/Makefile.am       |   23 -
 testsuites/libtests/termios03/Makefile.am       |   22 -
 testsuites/libtests/termios04/Makefile.am       |   22 -
 testsuites/libtests/termios05/Makefile.am       |   23 -
 testsuites/libtests/termios06/Makefile.am       |   22 -
 testsuites/libtests/termios07/Makefile.am       |   22 -
 testsuites/libtests/termios08/Makefile.am       |   22 -
 testsuites/libtests/termios09/Makefile.am       |   19 -
 testsuites/libtests/top/Makefile.am             |   21 -
 testsuites/libtests/tztest/Makefile.am          |   21 -
 testsuites/libtests/uid01/Makefile.am           |   22 -
 testsuites/libtests/utf8proc01/Makefile.am      |   19 -
 101 files changed, 1401 insertions(+), 2480 deletions(-)
 delete mode 100644 testsuites/libtests/POSIX/Makefile.am
 delete mode 100644 testsuites/libtests/block01/Makefile.am
 delete mode 100644 testsuites/libtests/block02/Makefile.am
 delete mode 100644 testsuites/libtests/block03/Makefile.am
 delete mode 100644 testsuites/libtests/block04/Makefile.am
 delete mode 100644 testsuites/libtests/block05/Makefile.am
 delete mode 100644 testsuites/libtests/block06/Makefile.am
 delete mode 100644 testsuites/libtests/block07/Makefile.am
 delete mode 100644 testsuites/libtests/block08/Makefile.am
 delete mode 100644 testsuites/libtests/block09/Makefile.am
 delete mode 100644 testsuites/libtests/block10/Makefile.am
 delete mode 100644 testsuites/libtests/block11/Makefile.am
 delete mode 100644 testsuites/libtests/block12/Makefile.am
 delete mode 100644 testsuites/libtests/block13/Makefile.am
 delete mode 100644 testsuites/libtests/block14/Makefile.am
 delete mode 100644 testsuites/libtests/block15/Makefile.am
 delete mode 100644 testsuites/libtests/block16/Makefile.am
 delete mode 100644 testsuites/libtests/block17/Makefile.am
 delete mode 100644 testsuites/libtests/bspcmdline01/Makefile.am
 delete mode 100644 testsuites/libtests/capture01/Makefile.am
 delete mode 100644 testsuites/libtests/complex/Makefile.am
 delete mode 100644 testsuites/libtests/cpuuse/Makefile.am
 delete mode 100644 testsuites/libtests/crypt01/Makefile.am
 delete mode 100644 testsuites/libtests/debugger01/Makefile.am
 delete mode 100644 testsuites/libtests/defaultconfig01/Makefile.am
 delete mode 100644 testsuites/libtests/devfs01/Makefile.am
 delete mode 100644 testsuites/libtests/devfs02/Makefile.am
 delete mode 100644 testsuites/libtests/devfs03/Makefile.am
 delete mode 100644 testsuites/libtests/devfs04/Makefile.am
 delete mode 100644 testsuites/libtests/deviceio01/Makefile.am
 delete mode 100644 testsuites/libtests/devnullfatal01/Makefile.am
 delete mode 100644 testsuites/libtests/dl01/Makefile.am
 delete mode 100644 testsuites/libtests/dl02/Makefile.am
 delete mode 100644 testsuites/libtests/dl03/Makefile.am
 delete mode 100644 testsuites/libtests/dl04/Makefile.am
 delete mode 100644 testsuites/libtests/dl05/Makefile.am
 delete mode 100644 testsuites/libtests/dumpbuf01/Makefile.am
 delete mode 100644 testsuites/libtests/exit01/Makefile.am
 delete mode 100644 testsuites/libtests/exit02/Makefile.am
 delete mode 100644 testsuites/libtests/flashdisk01/Makefile.am
 delete mode 100644 testsuites/libtests/ftp01/Makefile.am
 delete mode 100644 testsuites/libtests/getentropy01/Makefile.am
 delete mode 100644 testsuites/libtests/gxx01/Makefile.am
 delete mode 100644 testsuites/libtests/heapwalk/Makefile.am
 delete mode 100644 testsuites/libtests/i2c01/Makefile.am
 delete mode 100644 testsuites/libtests/libfdt01/Makefile.am
 delete mode 100644 testsuites/libtests/malloc02/Makefile.am
 delete mode 100644 testsuites/libtests/malloc03/Makefile.am
 delete mode 100644 testsuites/libtests/malloc04/Makefile.am
 delete mode 100644 testsuites/libtests/malloctest/Makefile.am
 delete mode 100644 testsuites/libtests/math/Makefile.am
 delete mode 100644 testsuites/libtests/mathf/Makefile.am
 delete mode 100644 testsuites/libtests/mathl/Makefile.am
 delete mode 100644 testsuites/libtests/md501/Makefile.am
 delete mode 100644 testsuites/libtests/mghttpd01/Makefile.am
 delete mode 100644 testsuites/libtests/mghttpd01/init_fs.tar
 create mode 100644 testsuites/libtests/mghttpd01/mghttpd01.tar
 delete mode 100644 testsuites/libtests/monitor/Makefile.am
 delete mode 100644 testsuites/libtests/monitor02/Makefile.am
 delete mode 100644 testsuites/libtests/mouse01/Makefile.am
 delete mode 100644 testsuites/libtests/networking01/Makefile.am
 delete mode 100644 testsuites/libtests/newlib01/Makefile.am
 delete mode 100644 testsuites/libtests/putenvtest/Makefile.am
 delete mode 100644 testsuites/libtests/pwdgrp01/Makefile.am
 delete mode 100644 testsuites/libtests/pwdgrp02/Makefile.am
 delete mode 100644 testsuites/libtests/rbheap01/Makefile.am
 delete mode 100644 testsuites/libtests/rtmonuse/Makefile.am
 delete mode 100644 testsuites/libtests/sha/Makefile.am
 delete mode 100644 testsuites/libtests/shell01/Makefile.am
 delete mode 100644 testsuites/libtests/sparsedisk01/Makefile.am
 delete mode 100644 testsuites/libtests/spi01/Makefile.am
 delete mode 100644 testsuites/libtests/stackchk/Makefile.am
 delete mode 100644 testsuites/libtests/stackchk01/Makefile.am
 delete mode 100644 testsuites/libtests/stringto01/Makefile.am
 delete mode 100644 testsuites/libtests/syscall01/Makefile.am
 delete mode 100644 testsuites/libtests/tar01/Makefile.am
 delete mode 100644 testsuites/libtests/tar02/Makefile.am
 delete mode 100644 testsuites/libtests/tar03/Makefile.am
 delete mode 100644 testsuites/libtests/termios/Makefile.am
 delete mode 100644 testsuites/libtests/termios01/Makefile.am
 delete mode 100644 testsuites/libtests/termios02/Makefile.am
 delete mode 100644 testsuites/libtests/termios03/Makefile.am
 delete mode 100644 testsuites/libtests/termios04/Makefile.am
 delete mode 100644 testsuites/libtests/termios05/Makefile.am
 delete mode 100644 testsuites/libtests/termios06/Makefile.am
 delete mode 100644 testsuites/libtests/termios07/Makefile.am
 delete mode 100644 testsuites/libtests/termios08/Makefile.am
 delete mode 100644 testsuites/libtests/termios09/Makefile.am
 delete mode 100644 testsuites/libtests/top/Makefile.am
 delete mode 100644 testsuites/libtests/tztest/Makefile.am
 delete mode 100644 testsuites/libtests/uid01/Makefile.am
 delete mode 100644 testsuites/libtests/utf8proc01/Makefile.am

diff --git a/testsuites/libtests/Makefile.am b/testsuites/libtests/Makefile.am
index 61f00220f8..da981707b9 100644
--- a/testsuites/libtests/Makefile.am
+++ b/testsuites/libtests/Makefile.am
@@ -1,110 +1,1249 @@
+#
+# Library Testsuite
+#
+
 ACLOCAL_AMFLAGS = -I ../aclocal
 
-_SUBDIRS  =
-_SUBDIRS += POSIX
-_SUBDIRS += block01
-_SUBDIRS += block02
-_SUBDIRS += block03
-_SUBDIRS += block04
-_SUBDIRS += block05
-_SUBDIRS += block06
-_SUBDIRS += block07
-_SUBDIRS += block08
-_SUBDIRS += block09
-_SUBDIRS += block10
-_SUBDIRS += block11
-_SUBDIRS += block12
-_SUBDIRS += block13
-_SUBDIRS += block14
-_SUBDIRS += block15
-_SUBDIRS += block16
-_SUBDIRS += block17
-_SUBDIRS += bspcmdline01
-_SUBDIRS += capture01
-_SUBDIRS += complex
-_SUBDIRS += cpuuse
-_SUBDIRS += crypt01
-_SUBDIRS += defaultconfig01
-_SUBDIRS += devfs01
-_SUBDIRS += devfs02
-_SUBDIRS += devfs03
-_SUBDIRS += devfs04
-_SUBDIRS += deviceio01
-_SUBDIRS += devnullfatal01
-_SUBDIRS += dumpbuf01
-_SUBDIRS += exit01
-_SUBDIRS += exit02
-_SUBDIRS += flashdisk01
-_SUBDIRS += gxx01
-_SUBDIRS += heapwalk
-_SUBDIRS += i2c01
-_SUBDIRS += libfdt01
-_SUBDIRS += malloc02
-_SUBDIRS += malloc03
-_SUBDIRS += malloc04
-_SUBDIRS += malloctest
-_SUBDIRS += math
-_SUBDIRS += mathf
-_SUBDIRS += mathl
-_SUBDIRS += md501
-_SUBDIRS += monitor
-_SUBDIRS += monitor02
-_SUBDIRS += mouse01
-_SUBDIRS += newlib01
-_SUBDIRS += putenvtest
-_SUBDIRS += pwdgrp01
-_SUBDIRS += pwdgrp02
-_SUBDIRS += getentropy01
-_SUBDIRS += rbheap01
-_SUBDIRS += rtmonuse
-_SUBDIRS += sha
-_SUBDIRS += shell01
-_SUBDIRS += sparsedisk01
-_SUBDIRS += spi01
-_SUBDIRS += stackchk
-_SUBDIRS += stackchk01
-_SUBDIRS += stringto01
-_SUBDIRS += tar01
-_SUBDIRS += tar02
-_SUBDIRS += tar03
-_SUBDIRS += termios
-_SUBDIRS += termios01
-_SUBDIRS += termios02
-_SUBDIRS += termios03
-_SUBDIRS += termios04
-_SUBDIRS += termios05
-_SUBDIRS += termios06
-_SUBDIRS += termios07
-_SUBDIRS += termios08
-_SUBDIRS += termios09
-_SUBDIRS += top
-_SUBDIRS += tztest
-_SUBDIRS += uid01
-_SUBDIRS += utf8proc01
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../automake/compile.am
 
-if NETTESTS
-if HAS_POSIX
-_SUBDIRS += mghttpd01
+lib_tests =
+lib_screens =
+lib_docs =
+
+support_includes = -I$(top_srcdir)/../support/include
+test_includes = -I$(top_srcdir)/support \
+	-I$(top_srcdir)/../psxtests/include
+
+if TEST_block01
+lib_tests += block01
+lib_screens += block01/block01.scn
+lib_docs += block01/block01.doc
+block01_SOURCES = block01/init.c
+block01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block01) \
+	$(support_includes)
+endif
+
+if TEST_block02
+lib_tests += block02
+lib_screens += block02/block02.scn
+lib_docs += block02/block02.doc
+block02_SOURCES = block02/init.c
+block02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block02) \
+	$(support_includes)
+endif
+
+if TEST_block03
+lib_tests += block03
+lib_screens += block03/block03.scn
+lib_docs += block03/block03.doc
+block03_SOURCES = block03/init.c
+block03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block03) \
+	$(support_includes)
+endif
+
+if TEST_block04
+lib_tests += block04
+lib_screens += block04/block04.scn
+lib_docs += block04/block04.doc
+block04_SOURCES = block04/init.c
+block04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block04) \
+	$(support_includes)
+endif
+
+if TEST_block05
+lib_tests += block05
+lib_screens += block05/block05.scn
+lib_docs += block05/block05.doc block05/block05.png
+block05_SOURCES = block05/init.c
+block05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block05) \
+	$(support_includes)
+endif
+
+if TEST_block06
+lib_tests += block06
+lib_screens += block06/block06.scn
+lib_docs += block06/block06.doc
+block06_SOURCES = block06/init.c
+block06_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block06) \
+	$(support_includes)
+endif
+
+if TEST_block07
+lib_tests += block07
+lib_screens += block07/block07.scn
+lib_docs += block07/block07.doc
+block07_SOURCES = block07/init.c
+block07_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block07) \
+	$(support_includes)
+endif
+
+if TEST_block08
+lib_tests += block08
+lib_screens += block08/block08.scn
+lib_docs += block08/block08.doc
+block08_SOURCES = block08/init.c block08/system.h \
+	block08/bdbuf_tests.c block08/bdbuf_tests.h block08/test_disk.c \
+	block08/bdbuf_test1_1.c block08/bdbuf_test1_2.c \
+	block08/bdbuf_test1_3.c block08/bdbuf_test1_4.c \
+	block08/bdbuf_test1_5.c block08/bdbuf_test2_1.c \
+	block08/bdbuf_test2_2.c block08/bdbuf_test3_1.c \
+	block08/bdbuf_test3_2.c block08/bdbuf_test3_3.c \
+	block08/bdbuf_test4_1.c block08/bdbuf_test4_2.c \
+	block08/bdbuf_test4_3.c
+block08_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block08) \
+	$(support_includes) -I$(top_srcdir)/block08
+endif
+
+if TEST_block09
+lib_tests += block09
+lib_screens += block09/block09.scn
+lib_docs += block09/block09.doc
+block09_SOURCES = block09/init.c
+block09_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block09) \
+	$(support_includes)
+endif
+
+if TEST_block10
+lib_tests += block10
+lib_screens += block10/block10.scn
+lib_docs += block10/block10.doc block10/block10.png
+block10_SOURCES = block10/init.c
+block10_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block10) \
+	$(support_includes)
+endif
+
+if TEST_block11
+lib_tests += block11
+lib_screens += block11/block11.scn
+lib_docs += block11/block11.doc
+block11_SOURCES = block11/init.c
+block11_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block11) \
+	$(support_includes)
+endif
+
+if TEST_block12
+lib_tests += block12
+lib_screens += block12/block12.scn
+lib_docs += block12/block12.doc
+block12_SOURCES = block12/init.c
+block12_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block12) \
+	$(support_includes)
+endif
+
+if TEST_block13
+lib_tests += block13
+lib_screens += block13/block13.scn
+lib_docs += block13/block13.doc
+block13_SOURCES = block13/init.c
+block13_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block13) \
+	$(support_includes)
+endif
+
+if TEST_block14
+lib_tests += block14
+lib_screens += block14/block14.scn
+lib_docs += block14/block14.doc
+block14_SOURCES = block14/init.c
+block14_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block14) \
+	$(support_includes)
+endif
+
+if TEST_block15
+lib_tests += block15
+lib_screens += block15/block15.scn
+lib_docs += block15/block15.doc
+block15_SOURCES = block15/init.c
+block15_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block15) \
+	$(support_includes)
+endif
+
+if TEST_block16
+lib_tests += block16
+lib_screens += block16/block16.scn
+lib_docs += block16/block16.doc
+block16_SOURCES = block16/init.c
+block16_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block16) \
+	$(support_includes)
+endif
+
+if TEST_block17
+lib_tests += block17
+lib_screens += block17/block17.scn
+lib_docs += block17/block17.doc
+block17_SOURCES = block17/init.c
+block17_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_block17) \
+	$(support_includes)
+endif
+
+if TEST_bspcmdline01
+lib_tests += bspcmdline01
+lib_screens += bspcmdline01/bspcmdline01.scn
+lib_docs += bspcmdline01/bspcmdline01.doc
+bspcmdline01_SOURCES = bspcmdline01/init.c
+bspcmdline01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_bspcmdline01) \
+	$(support_includes)
+endif
+
+if TEST_calloc
+lib_tests += calloc.norun
+calloc_norun_SOURCES = POSIX/calloc.c
+endif
+
+if TEST_capture01
+lib_tests += capture01
+lib_screens += capture01/capture01.scn
+lib_docs += capture01/capture01.doc
+capture01_SOURCES = capture01/init.c capture01/test1.c \
+	capture01/system.h
+capture01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_capture01) \
+	$(support_includes)
+endif
+
+if TEST_clock_gettime
+lib_tests += clock_gettime.norun
+clock_gettime_norun_SOURCES = POSIX/clock_gettime.c
+endif
+
+if TEST_close
+lib_tests += close.norun
+close_norun_SOURCES = POSIX/close.c
+endif
+
+if TEST_complex
+lib_tests += complex
+lib_screens += complex/complex.scn
+complex_SOURCES = complex/init.c complex/docomplex.c \
+	complex/docomplexf.c complex/docomplexl.c
+complex_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_complex) \
+	$(support_includes) -DNO_LONG_DOUBLE
+complex_LDADD = -lm
+endif
+
+if TEST_cpuuse
+lib_tests += cpuuse
+lib_screens += cpuuse/cpuuse.scn
+cpuuse_SOURCES = cpuuse/init.c cpuuse/task1.c cpuuse/task2.c \
+	cpuuse/task3.c cpuuse/tswitch.c cpuuse/system.h
+cpuuse_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_cpuuse) \
+	$(support_includes)
+endif
+
+if TEST_crypt01
+lib_tests += crypt01
+lib_screens += crypt01/crypt01.scn
+lib_docs += crypt01/crypt01.doc
+crypt01_SOURCES = crypt01/init.c
+crypt01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_crypt01) \
+	$(support_includes)
+endif
+
+if DEBUGGERTESTS
+if TEST_debugger01
+lib_tests += debugger01
+lib_screens += debugger01/debugger01.scn
+debugger01_SOURCES = debugger01/init.c debugger01/remote.c \
+	debugger01/system.h
+debugger01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_debugger01) \
+	$(support_includes)
+endif
+endif
+
+if TEST_defaultconfig01
+lib_tests += defaultconfig01
+lib_screens += defaultconfig01/defaultconfig01.scn
+lib_docs += defaultconfig01/defaultconfig01.doc
+defaultconfig01_SOURCES = defaultconfig01/init.c
+defaultconfig01_CPPFLAGS = $(AM_CPPFLAGS) \
+	$(TEST_FLAGS_defaultconfig01) $(support_includes)
+endif
+
+if TEST_devfs01
+lib_tests += devfs01
+lib_screens += devfs01/devfs01.scn
+lib_docs += devfs01/devfs01.doc
+devfs01_SOURCES = devfs01/init.c
+devfs01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_devfs01) \
+	$(support_includes)
+endif
+
+if TEST_devfs02
+lib_tests += devfs02
+lib_screens += devfs02/devfs02.scn
+lib_docs += devfs02/devfs02.doc
+devfs02_SOURCES = devfs02/init.c
+devfs02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_devfs02) \
+	$(support_includes)
+endif
+
+if TEST_devfs03
+lib_tests += devfs03
+lib_screens += devfs03/devfs03.scn
+lib_docs += devfs03/devfs03.doc
+devfs03_SOURCES = devfs03/init.c
+devfs03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_devfs03) \
+	$(support_includes)
+endif
+
+if TEST_devfs04
+lib_tests += devfs04
+lib_screens += devfs04/devfs04.scn
+lib_docs += devfs04/devfs04.doc
+devfs04_SOURCES = devfs04/init.c devfs04/test_driver.c \
+	devfs04/test_driver.h
+devfs04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_devfs04) \
+	$(support_includes)
+endif
+
+if TEST_deviceio01
+lib_tests += deviceio01
+lib_screens += deviceio01/deviceio01.scn
+lib_docs += deviceio01/deviceio01.doc
+deviceio01_SOURCES = deviceio01/init.c deviceio01/test_driver.c \
+	deviceio01/test_driver.h
+deviceio01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_deviceio01) \
+	$(support_includes)
+endif
+
+if TEST_devnullfatal01
+lib_tests += devnullfatal01
+lib_screens += devnullfatal01/devnullfatal01.scn
+lib_docs += devnullfatal01/devnullfatal01.doc
+devnullfatal01_SOURCES = ../sptests/spfatal_support/init.c \
+	../sptests/spfatal_support/system.h devnullfatal01/testcase.h
+devnullfatal01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_devnullfatal01) \
+	$(support_includes) -I$(top_srcdir)/../../sptests/spfatal_support \
+	-I$(top_srcdir)/devnullfatal01
+endif
+
+if DLTESTS
+if TEST_dl01
+lib_tests += dl01
+lib_screens += dl01/dl01.scn
+lib_docs += dl01/dl01.doc
+dl01_SOURCES = dl01/init.c dl01/dl-load.c dl01-tar.c dl01-tar.h
+dl01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_dl01) $(support_includes)
+dl01-o1.o: dl01/dl-o1.c
+	$(COMPILE) -c -o $@ $<
+dl01.tar: dl01-o1.o
+	@rm -f $@
+	$(PAX) -w -f $@ $<
+dl01-tar.c: dl01.tar
+	$(BIN2C) -C $< $@
+dl01-tar.h: dl01.tar
+	$(BIN2C) -H $< $@
+dl01-tar.o: dl01-tar.c dl01-tar.h
+dl01/init.c: dl01-tar.o
+dl01.pre: $(dl01_OBJECTS) $(dl01_DEPENDENCIES)
+	@rm -f dl01.pre
+	$(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $+
+dl01-sym.o: dl01.pre
+	rtems-syms -e -c "$(CFLAGS)" -o $@ $<
+dl01$(EXEEXT):  $(dl01_OBJECTS) $(dl01_DEPENDENCIES) dl01-sym.o
+	@rm -f $@
+	$(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $+
+CLEANFILES += dl01.pre dl01-sym.o dl02-o1.o dl01.tar dl01-tar.h
+endif
+endif
+
+if DLTESTS
+if TEST_dl02
+lib_tests += dl02
+lib_screens += dl02/dl02.scn
+lib_docs += dl02/dl02.doc
+dl02_SOURCES = dl02/init.c dl02/dl-load.c dl02-tar.c dl02-tar.h
+dl02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_dl02) $(support_includes)
+dl02-o1.o: dl02/dl-o1.c
+	$(COMPILE) -c -o $@ $<
+dl02-o2.o: dl02/dl-o2.c
+	$(COMPILE) -c -o $@ $<
+dl02.tar: dl02-o1.o dl02-o2.o
+	@rm -f $@
+	$(PAX) -w -f $@ $<
+dl02-tar.c: dl02.tar
+	$(BIN2C) -C $< $@
+dl02-tar.h: dl02.tar
+	$(BIN2C) -H $< $@
+dl02-tar.o: dl02-tar.c dl02-tar.h
+dl02/init.c: dl02-tar.o
+dl02.pre: $(dl02_OBJECTS) $(dl02_DEPENDENCIES)
+	@rm -f dl02.pre
+	$(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $+
+dl02-sym.o: dl02.pre
+	rtems-syms -e -c "$(CFLAGS)" -o $@ $<
+dl02$(EXEEXT):  $(dl02_OBJECTS) $(dl02_DEPENDENCIES) dl02-sym.o
+	@rm -f $@
+	$(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $+
+CLEANFILES += dl02.pre dl02-sym.o dl02-o1.o dl02-o2.o dl02.tar dl02-tar.h
+endif
+endif
+
+if DLTESTS
+if TEST_dl03
+lib_tests += dl03
+lib_screens += dl03/dl03.scn
+lib_docs += dl03/dl03.doc
+dl03_SOURCES = dl03/init.c dl03/dl-cache.c
+dl03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_dl03) $(support_includes)
 endif
-_SUBDIRS += ftp01
-_SUBDIRS += networking01
-_SUBDIRS += syscall01
 endif
 
-##
-## The libdl use use AM's BUILT_SOURCE and this has a weird side effect of
-## restarting the subdir loop. No idea why.
-##
 if DLTESTS
-_SUBDIRS += dl01 dl02 dl03
 if HAS_CXX
-_SUBDIRS += dl04 dl05
+if TEST_dl04
+lib_tests += dl04
+lib_screens += dl04/dl04.scn
+lib_docs += dl04/dl04.doc
+dl04_SOURCES = dl04/init.c dl04/dl-load.c dl04/dl-cpp.cpp dl04-tar.c \
+	dl04-tar.h
+dl04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_dl04) $(support_includes)
+dl04-o4.o: dl04/dl-o4.cpp
+	$(CXXCOMPILE) -c -o $@ $<
+dl04.tar: dl04-o4.o
+	@rm -f $@
+	$(PAX) -w -f $@ $<
+dl04-tar.c: dl04.tar
+	$(BIN2C) -C $< $@
+dl04-tar.h: dl04.tar
+	$(BIN2C) -H $< $@
+dl04-tar.o: dl04-tar.c dl04-tar.h
+dl04/init.c: dl04-tar.o
+dl04.pre: $(dl04_OBJECTS) $(dl04_DEPENDENCIES)
+	@rm -f dl04.pre
+	$(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $+
+dl04-sym.o: dl04.pre
+	rtems-syms -e -c "$(CFLAGS)" -o $@ $<
+dl04$(EXEEXT):  $(dl04_OBJECTS) $(dl04_DEPENDENCIES) dl04-sym.o
+	@rm -f $@
+	$(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $+
+CLEANFILES += dl04.pre dl04-sym.o dl04-o4.o dl04.tar dl04-tar.h
+endif
 endif
 endif
 
-if DEBUGGERTESTS
-_SUBDIRS += debugger01
+if DLTESTS
+if HAS_CXX
+if TEST_dl05
+lib_tests += dl05
+lib_screens += dl05/dl05.scn
+lib_docs += dl05/dl05.doc
+dl05_SOURCES = dl05/init.c dl05/dl-load.c dl05/dl-cpp.cpp dl05-tar.c \
+	dl05-tar.h
+dl05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_dl05) $(support_includes)
+dl05-o5.o: dl05/dl-o5.cpp
+	$(CXXCOMPILE) -c -o $@ $<
+dl05.tar: dl05-o5.o
+	@rm -f $@
+	$(PAX) -w -f $@ $<
+dl05-tar.c: dl05.tar
+	$(BIN2C) -C $< $@
+dl05-tar.h: dl05.tar
+	$(BIN2C) -H $< $@
+dl05-tar.o: dl05-tar.c dl05-tar.h
+dl05/init.c: dl05-tar.o
+dl05.pre: $(dl05_OBJECTS) $(dl05_DEPENDENCIES)
+	@rm -f dl05.pre
+	$(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $+
+dl05-sym.o: dl05.pre
+	rtems-syms -e -c "$(CFLAGS)" -o $@ $<
+dl05$(EXEEXT):  $(dl05_OBJECTS) $(dl05_DEPENDENCIES) dl05-sym.o
+	@rm -f $@
+	$(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ $+
+CLEANFILES += dl05.pre dl05-sym.o dl05-o5.o dl05.tar dl05-tar.h
+endif
+endif
+endif
+
+if TEST_dumpbuf01
+lib_tests += dumpbuf01
+lib_screens += dumpbuf01/dumpbuf01.scn
+lib_docs += dumpbuf01/dumpbuf01.doc
+dumpbuf01_SOURCES = dumpbuf01/init.c
+dumpbuf01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_dumpbuf01) \
+	$(support_includes)
+endif
+
+if TEST_dup2
+lib_tests += dup2.norun
+dup2_norun_SOURCES = POSIX/dup2.c
+endif
+
+if TEST_exit01
+lib_tests += exit01
+lib_screens += exit01/exit01.scn
+lib_docs += exit01/exit01.doc
+exit01_SOURCES = exit01/init.c
+exit01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_exit01) \
+	$(support_includes)
+endif
+
+if TEST_exit02
+lib_tests += exit02
+lib_screens += exit02/exit02.scn
+lib_docs += exit02/exit02.doc
+exit02_SOURCES = exit02/init.c
+exit02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_exit02) \
+	$(support_includes)
+endif
+
+if TEST_fcntl
+lib_tests += fcntl.norun
+fcntl_norun_SOURCES = POSIX/fcntl.c
+endif
+
+if TEST_flashdisk01
+lib_tests += flashdisk01
+lib_screens += flashdisk01/flashdisk01.scn
+lib_docs += flashdisk01/flashdisk01.doc
+flashdisk01_SOURCES = flashdisk01/init.c \
+	flashdisk01/test-file-system.c
+flashdisk01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_flashdisk01) \
+	$(support_includes)
+endif
+
+if TEST_flockfile
+lib_tests += flockfile.norun
+flockfile_norun_SOURCES = POSIX/flockfile.c
+endif
+
+if TEST_fork
+lib_tests += fork.norun
+fork_norun_SOURCES = POSIX/fork.c
+endif
+
+if TEST_free
+lib_tests += free.norun
+free_norun_SOURCES = POSIX/free.c
+endif
+
+if TEST_fstat
+lib_tests += fstat.norun
+fstat_norun_SOURCES = POSIX/fstat.c
+endif
+
+if NETTESTS
+if TEST_ftp01
+lib_tests += ftp01
+lib_screens += ftp01/ftp01.scn
+lib_docs += ftp01/ftp01.doc
+ftp01_SOURCES = ftp01/init.c
+ftp01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_ftp01) \
+	$(support_includes) -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
+ftp01_LDADD = -lftpd
+endif
 endif
 
-include $(top_srcdir)/../automake/subdirs.am
+if TEST_ftrylockfile
+lib_tests += ftrylockfile.norun
+ftrylockfile_norun_SOURCES = POSIX/ftrylockfile.c
+endif
+
+if TEST_funlockfile
+lib_tests += funlockfile.norun
+funlockfile_norun_SOURCES = POSIX/funlockfile.c
+endif
+
+if TEST_getentropy01
+lib_tests += getentropy01
+lib_screens += getentropy01/getentropy01.scn
+lib_docs += getentropy01/getentropy01.doc
+getentropy01_SOURCES = getentropy01/init.c
+getentropy01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_getentropy01) \
+	$(support_includes)
+endif
+
+if TEST_getlogin
+lib_tests += getlogin.norun
+getlogin_norun_SOURCES = POSIX/getlogin.c
+endif
+
+if TEST_getpwnam
+lib_tests += getpwnam.norun
+getpwnam_norun_SOURCES = POSIX/getpwnam.c
+endif
+
+if TEST_getpwuid
+lib_tests += getpwuid.norun
+getpwuid_norun_SOURCES = POSIX/getpwuid.c
+endif
+
+if TEST_gettimeofday
+lib_tests += gettimeofday.norun
+gettimeofday_norun_SOURCES = POSIX/gettimeofday.c
+endif
+
+if TEST_getuid
+lib_tests += getuid.norun
+getuid_norun_SOURCES = POSIX/getuid.c
+endif
+
+if TEST_gxx01
+lib_tests += gxx01
+lib_screens += gxx01/gxx01.scn
+lib_docs += gxx01/gxx01.doc
+gxx01_SOURCES = gxx01/init.c
+gxx01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_gxx01) \
+	$(support_includes)
+endif
+
+if TEST_heapwalk
+lib_tests += heapwalk
+lib_screens += heapwalk/heapwalk.scn
+heapwalk_SOURCES = heapwalk/init.c heapwalk/system.h
+heapwalk_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_heapwalk) \
+	$(support_includes)
+endif
+
+if TEST_htonl
+lib_tests += htonl.norun
+htonl_norun_SOURCES = POSIX/htonl.c
+endif
+
+if TEST_i2c01
+lib_tests += i2c01
+lib_screens += i2c01/i2c01.scn
+lib_docs += i2c01/i2c01.doc
+i2c01_SOURCES = i2c01/init.c
+i2c01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_i2c01) \
+	$(support_includes)
+endif
+
+if TEST_iconv
+lib_tests += iconv.norun
+iconv_norun_SOURCES = POSIX/iconv.c
+endif
+
+if TEST_iconv_close
+lib_tests += iconv_close.norun
+iconv_close_norun_SOURCES = POSIX/iconv_close.c
+endif
+
+if TEST_iconv_open
+lib_tests += iconv_open.norun
+iconv_open_norun_SOURCES = POSIX/iconv_open.c
+endif
+
+if TEST_kill
+lib_tests += kill.norun
+kill_norun_SOURCES = POSIX/kill.c
+endif
+
+if TEST_libfdt01
+lib_tests += libfdt01
+lib_screens += libfdt01/libfdt01.scn
+lib_docs += libfdt01/libfdt01.doc
+libfdt01_SOURCES = libfdt01/init.c libfdt01/some.c
+libfdt01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_libfdt01) \
+	$(support_includes)
+endif
+
+if TEST_longjmp
+lib_tests += longjmp.norun
+longjmp_norun_SOURCES = POSIX/longjmp.c
+endif
+
+if TEST_lseek
+lib_tests += lseek.norun
+lseek_norun_SOURCES = POSIX/lseek.c
+endif
+
+if TEST_lstat
+lib_tests += lstat.norun
+lstat_norun_SOURCES = POSIX/lstat.c
+endif
+
+if TEST_malloc
+lib_tests += malloc.norun
+malloc_norun_SOURCES = POSIX/malloc.c
+endif
+
+if TEST_malloc02
+lib_tests += malloc02
+lib_screens += malloc02/malloc02.scn
+lib_docs += malloc02/malloc02.doc
+malloc02_SOURCES = malloc02/init.c
+malloc02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_malloc02) \
+	$(support_includes)
+endif
+
+if TEST_malloc03
+lib_tests += malloc03
+lib_screens += malloc03/malloc03.scn
+lib_docs += malloc03/malloc03.doc
+malloc03_SOURCES = malloc03/init.c
+malloc03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_malloc03) \
+	$(support_includes)
+endif
+
+if TEST_malloc04
+lib_tests += malloc04
+lib_screens += malloc04/malloc04.scn
+lib_docs += malloc04/malloc04.doc
+malloc04_SOURCES = malloc04/init.c
+malloc04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_malloc04) \
+	$(support_includes)
+endif
+
+if TEST_malloctest
+lib_tests += malloctest
+lib_screens += malloctest/malloctest.scn
+malloctest_SOURCES = malloctest/init.c malloctest/task1.c \
+	malloctest/system.h
+malloctest_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_malloctest) \
+	$(support_includes)
+endif
+
+if TEST_math
+lib_tests += math
+lib_screens += math/math.scn
+math_SOURCES = math/init.c math/domath.c
+math_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_math) $(support_includes) \
+	-I$(top_srcdir)/math
+math_LDADD = -lm
+endif
+
+if TEST_mathf
+lib_tests += mathf
+lib_screens += mathf/mathf.scn
+mathf_SOURCES = mathf/init.c mathf/domathf.c
+mathf_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mathf) \
+	$(support_includes) -I$(top_srcdir)/math
+mathf_LDADD = -lm
+endif
+
+if TEST_mathl
+lib_tests += mathl
+lib_screens += mathl/mathl.scn
+mathl_SOURCES = mathl/init.c mathl/domathl.c
+mathl_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mathl) \
+	$(support_includes) -I$(top_srcdir)/math \
+	-DNO_LONG_DOUBLE
+mathl_LDADD = -lm
+endif
+
+if TEST_md501
+lib_tests += md501
+lib_screens += md501/md501.scn
+lib_docs += md501/md501.doc
+md501_SOURCES = md501/init.c
+md501_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_md501) \
+	$(support_includes)
+endif
+
+if NETTESTS
+if HAS_POSIX
+if TEST_mghttpd01
+lib_tests += mghttpd01
+lib_screens += mghttpd01/mghttpd01.scn
+lib_docs += mghttpd01/mghttpd01.doc
+mghttpd01_SOURCES = mghttpd01/init.c mghttpd01_tar.c \
+	mghttpd01_tar.h mghttpd01/test-http-client.c \
+	mghttpd01/test-http-client.h
+mghttpd01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mghttpd01) \
+	$(support_includes) -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
+mghttpd01_LDADD = -lmghttpd
+mghttpd01_tar.c: mghttpd01/mghttpd01.tar
+	$(BIN2C) -C $< $@
+mghttpd01_tar.h: mghttpd01/mghttpd01.tar
+	$(BIN2C) -H $< $@
+mghttpd01-tar.o: mghttpd01-tar.c mghttpd01-tar.h
+mghttpd01/init.c: mghttpd01_tar.h
+CLEANFILES += mghttpd01.tar mghttpd01_tar.c mghttpd01_tar.h
+endif
+endif
+endif
+
+if TEST_monitor
+lib_tests += monitor
+monitor_SOURCES = monitor/init.c monitor/system.h
+monitor_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_monitor) \
+	$(support_includes)
+endif
+
+if TEST_monitor02
+lib_tests += monitor02
+lib_screens += monitor02/monitor02.scn
+monitor02_SOURCES = monitor02/init.c monitor02/system.h
+monitor02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_monitor02) \
+	$(support_includes)
+endif
+
+if TEST_mouse01
+lib_tests += mouse01
+lib_screens += mouse01/mouse01.scn
+lib_docs += mouse01/mouse01.doc
+mouse01_SOURCES = mouse01/init.c mouse01/serial_mouse_config.c \
+	mouse01/msmouse.c termios04/termios_testdriver_intr.c
+mouse01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_mouse01) \
+	$(support_includes) -I$(top_srcdir)/termios04
+endif
+
+if TEST_nanosleep
+lib_tests += nanosleep.norun
+nanosleep_norun_SOURCES = POSIX/nanosleep.c
+endif
+
+if NETTESTS
+if TEST_networking01
+lib_tests += networking01
+lib_screens += networking01/networking01.scn
+lib_docs += networking01/networking01.doc
+networking01_SOURCES = networking01/init.c
+networking01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_networking01) \
+	$(support_includes) -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
+endif
+endif
+
+if TEST_newlib01
+lib_tests += newlib01
+lib_screens += newlib01/newlib01.scn
+lib_docs += newlib01/newlib01.doc
+newlib01_SOURCES = newlib01/init.c
+newlib01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_newlib01) \
+	$(support_includes)
+endif
+
+if TEST_open
+lib_tests += open.norun
+open_norun_SOURCES = POSIX/open.c
+endif
+
+if TEST_pipe
+lib_tests += pipe.norun
+pipe_norun_SOURCES = POSIX/pipe.c
+endif
+
+if TEST_posix_memalign
+lib_tests += posix_memalign.norun
+posix_memalign_norun_SOURCES = POSIX/posix_memalign.c
+endif
+
+if TEST_putenvtest
+lib_tests += putenvtest
+lib_screens += putenvtest/putenvtest.scn
+putenvtest_SOURCES = putenvtest/init.c
+putenvtest_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_putenvtest) \
+	$(support_includes)
+endif
+
+if TEST_pwdgrp01
+lib_tests += pwdgrp01
+lib_screens += pwdgrp01/pwdgrp01.scn
+lib_docs += pwdgrp01/pwdgrp01.doc
+pwdgrp01_SOURCES = pwdgrp01/init.c
+pwdgrp01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_pwdgrp01) \
+	$(support_includes)
+endif
+
+if TEST_pwdgrp02
+lib_tests += pwdgrp02
+lib_screens += pwdgrp02/pwdgrp02.scn
+lib_docs += pwdgrp02/pwdgrp02.doc
+pwdgrp02_SOURCES = pwdgrp02/init.c
+pwdgrp02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_pwdgrp02) \
+	$(support_includes)
+endif
+
+if TEST_rbheap01
+lib_tests += rbheap01
+lib_screens += rbheap01/rbheap01.scn
+lib_docs += rbheap01/rbheap01.doc
+rbheap01_SOURCES = rbheap01/init.c
+rbheap01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rbheap01) \
+	$(support_includes)
+endif
+
+if TEST_read
+lib_tests += read.norun
+read_norun_SOURCES = POSIX/read.c
+endif
+
+if TEST_readv
+lib_tests += readv.norun
+readv_norun_SOURCES = POSIX/readv.c
+endif
+
+if TEST_realloc
+lib_tests += realloc.norun
+realloc_norun_SOURCES = POSIX/realloc.c
+endif
+
+if TEST_rtmonuse
+lib_tests += rtmonuse
+lib_screens += rtmonuse/rtmonuse.scn
+rtmonuse_SOURCES = rtmonuse/init.c rtmonuse/getall.c rtmonuse/task1.c \
+	rtmonuse/system.h
+rtmonuse_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_rtmonuse) \
+	$(support_includes)
+endif
+
+if TEST_setjmp
+lib_tests += setjmp.norun
+setjmp_norun_SOURCES = POSIX/setjmp.c
+endif
+
+if TEST_sha
+lib_tests += sha
+lib_screens += sha/sha.scn
+lib_docs += sha/sha.doc
+sha_SOURCES = sha/init.c
+sha_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_sha) $(support_includes)
+endif
+
+if TEST_shell01
+lib_tests += shell01
+lib_screens += shell01/shell01.scn
+lib_docs += shell01/shell01.doc
+shell01_SOURCES = shell01/init.c
+shell01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_shell01) \
+	$(support_includes)
+endif
+
+if TEST_sigaddset
+lib_tests += sigaddset.norun
+sigaddset_norun_SOURCES = POSIX/sigaddset.c
+endif
+
+if TEST_sigdelset
+lib_tests += sigdelset.norun
+sigdelset_norun_SOURCES = POSIX/sigdelset.c
+endif
+
+if TEST_sigemptyset
+lib_tests += sigemptyset.norun
+sigemptyset_norun_SOURCES = POSIX/sigemptyset.c
+endif
+
+if TEST_sigfillset
+lib_tests += sigfillset.norun
+sigfillset_norun_SOURCES = POSIX/sigfillset.c
+endif
+
+if TEST_sigismember
+lib_tests += sigismember.norun
+sigismember_norun_SOURCES = POSIX/sigismember.c
+endif
+
+if TEST_sigprocmask
+lib_tests += sigprocmask.norun
+sigprocmask_norun_SOURCES = POSIX/sigprocmask.c
+endif
+
+if TEST_sparsedisk01
+lib_tests += sparsedisk01
+lib_screens += sparsedisk01/sparsedisk01.scn
+lib_docs += sparsedisk01/sparsedisk01.doc
+sparsedisk01_SOURCES = sparsedisk01/init.c
+sparsedisk01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_sparsedisk01) \
+	$(support_includes)
+endif
+
+if TEST_spi01
+lib_tests += spi01
+lib_screens += spi01/spi01.scn
+lib_docs += spi01/spi01.doc
+spi01_SOURCES = spi01/init.c
+spi01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_spi01) \
+	$(support_includes)
+endif
+
+if TEST_stackchk
+lib_tests += stackchk
+lib_screens += stackchk/stackchk.scn
+stackchk_SOURCES = stackchk/blow.c stackchk/init.c stackchk/task1.c \
+	stackchk/system.h
+stackchk_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_stackchk) \
+	$(support_includes)
+endif
+
+if TEST_stackchk01
+lib_tests += stackchk01
+lib_screens += stackchk01/stackchk01.scn
+lib_docs += stackchk01/stackchk01.doc
+stackchk01_SOURCES = stackchk01/init.c
+stackchk01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_stackchk01) \
+	$(support_includes)
+endif
+
+if TEST_stat
+lib_tests += stat.norun
+stat_norun_SOURCES = POSIX/stat.c
+endif
+
+if TEST_stringto01
+lib_tests += stringto01
+lib_screens += stringto01/stringto01.scn
+lib_docs += stringto01/stringto01.doc
+stringto01_SOURCES = stringto01/init.c \
+	stringto01/stringto_test_template.h
+stringto01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_stringto01) \
+	$(support_includes)
+endif
+
+if NETTESTS
+if TEST_syscall01
+lib_tests += syscall01
+lib_screens += syscall01/syscall01.scn
+lib_docs += syscall01/syscall01.doc
+syscall01_SOURCES = syscall01/init.c
+syscall01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_syscall01) \
+	$(support_includes) -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
+endif
+endif
+
+if TARTESTS
+if TEST_tar01
+lib_tests += tar01
+lib_screens += tar01/tar01.scn
+lib_docs += tar01/tar01.doc
+tar01_SOURCES = tar01/init.c ../psxtests/psxfile01/test_cat.c \
+	tar01_tar.c tar01_tar.h tar01_tar_gz.c tar01_tar_gz.h
+if TARTEST_XZ
+tar01_SOURCES += tar01_tar_xz.c tar01_tar_xz.h
+endif
+tar01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tar01) \
+	$(support_includes) $(test_includes) -I$(top_srcdir)/include
+tar01_LDADD = -lrtemscpu -lz
+tar01.tar: Makefile
+	rm -rf tar01_fs
+	$(MKDIR_P) tar01_fs/home
+	(echo "This is a test of loading an RTEMS filesystem from an" ; \
+	echo "initial tar image.") > tar01_fs/home/test_file
+	(echo "#! joel" ; \
+	echo "ls -las /dev") > tar01_fs/home/test_script
+	chmod +x tar01_fs/home/test_script
+	(cd tar01_fs; \
+	$(LN_S) home/test_file symlink; \
+	$(PAX) -w -f ../tar01.tar home symlink)
+tar01_tar.c: tar01.tar
+	$(BIN2C) -C $< $@
+tar01_tar.h: tar01.tar
+	$(BIN2C) -H $< $@
+tar01-tar.o: tar01-tar.c tar01-tar.h
+tar01.tar.gz: tar01.tar
+	$(GZIP) < $< > $@
+tar01_tar_gz.c: tar01.tar.gz
+	$(BIN2C) -C $< $@
+tar01_tar_gz.h: tar01.tar.gz
+	$(BIN2C) -H $< $@
+CLEANFILES += tar01.tar tar01_tar.c tar01_tar.h \
+	tar01.tar.gz tar01_tar_gz.c tar01_tar_gz.h
+if TARTEST_XZ
+tar01.tar.xz: tar01.tar
+	$(XZ) < $< > $@
+tar01_tar_xz.c: tar01.tar.xz
+	$(BIN2C) -C $< $@
+tar01_tar_xz.h: tar01.tar.xz
+	$(BIN2C) -H $< $@
+TAR01_XZ_H = tar01_tar_xz.h
+CLEANFILES += tar01.tar.xz tar01_tar_xz.c tar01_tar_xz.h
+endif
+tar01/init.c: tar01_tar.h tar01_tar_gz.h $(TAR01_XZ_H)
+endif
+endif
+
+if TARTESTS
+if TEST_tar02
+lib_tests += tar02
+lib_screens += tar02/tar02.scn
+lib_docs += tar02/tar02.doc
+tar02_SOURCES = tar02/init.c ../psxtests/psxfile01/test_cat.c \
+	tar02_tar.c tar02_tar.h
+tar02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tar02) \
+	$(support_includes) $(test_includes) -I$(top_srcdir)/include
+tar02.tar: Makefile
+	rm -rf tar02_fs
+	$(MKDIR_P) tar02_fs/home
+	(echo "This is a test of loading an RTEMS filesystem from an" ; \
+	echo "initial tar image.") > tar02_fs/home/test_file
+	(echo "#! joel" ; \
+	echo "ls -las /dev") > tar02_fs/home/test_script
+	chmod +x tar02_fs/home/test_script
+	(cd tar02_fs; \
+	$(LN_S) home/test_file symlink; \
+	$(PAX) -w -f ../tar02.tar home symlink)
+tar02_tar.c: tar02.tar
+	$(BIN2C) -C $< $@
+tar02_tar.h: tar02.tar
+	$(BIN2C) -H $< $@
+tar02-tar.o: tar02-tar.c tar02-tar.h
+tar02/init.c: tar02_tar.h
+CLEANFILES += tar02.tar tar02_tar.c tar02_tar.h
+endif
+endif
+
+if TEST_tar03
+lib_tests += tar03
+lib_screens += tar03/tar03.scn
+lib_docs += tar03/tar03.doc
+tar03_SOURCES = tar03/init.c
+tar03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tar03) \
+	$(support_includes)
+endif
+
+if TEST_termios
+lib_tests += termios
+termios_SOURCES = termios/init.c
+termios_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_termios) \
+	$(support_includes)
+endif
+
+if TEST_termios01
+lib_tests += termios01
+lib_screens += termios01/termios01.scn
+lib_docs += termios01/termios01.doc
+termios01_SOURCES = termios01/init.c termios01/termios_testdriver.c \
+	termios01/termios_testdriver.h
+termios01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_termios01) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_termios02
+lib_tests += termios02
+lib_screens += termios02/termios02.scn
+lib_docs += termios02/termios02.doc
+termios02_SOURCES = termios02/init.c
+termios02_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_termios02) \
+	$(support_includes) -I$(top_srcdir)/include
+endif
+
+if TEST_termios03
+lib_tests += termios03
+lib_screens += termios03/termios03.scn
+lib_docs += termios03/termios03.doc
+termios03_SOURCES = termios03/init.c \
+	termios03/termios_testdriver_polled.c \
+	termios03/termios_testdriver_polled.h
+termios03_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_termios03) \
+	$(support_includes)
+endif
+
+if TEST_termios04
+lib_tests += termios04
+lib_screens += termios04/termios04.scn
+lib_docs += termios04/termios04.doc
+termios04_SOURCES = termios04/init.c \
+	termios04/termios_testdriver_intr.c \
+	termios04/termios_testdriver_intr.h
+termios04_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_termios04) \
+	$(support_includes)
+endif
+
+if TEST_termios05
+lib_tests += termios05
+lib_screens += termios05/termios05.scn
+lib_docs += termios05/termios05.doc
+termios05_SOURCES = termios05/init.c \
+	termios04/termios_testdriver_intr.c
+termios05_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_termios05) \
+	$(support_includes) -I$(top_srcdir)/termios04 -DTASK_DRIVEN
+endif
+
+if TEST_termios06
+lib_tests += termios06
+lib_screens += termios06/termios06.scn
+lib_docs += termios06/termios06.doc
+termios06_SOURCES = termios06/init.c \
+	termios03/termios_testdriver_polled.c termios06/test_pppd.c
+termios06_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_termios06) \
+	$(support_includes) -I$(top_srcdir)/termios03
+endif
+
+if TEST_termios07
+lib_tests += termios07
+lib_screens += termios07/termios07.scn
+lib_docs += termios07/termios07.doc
+termios07_SOURCES = termios07/init.c \
+	termios04/termios_testdriver_intr.c
+termios07_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_termios07) \
+	$(support_includes) -I$(top_srcdir)/termios04
+endif
+
+if TEST_termios08
+lib_tests += termios08
+lib_screens += termios08/termios08.scn
+lib_docs += termios08/termios08.doc
+termios08_SOURCES = termios08/init.c \
+	termios03/termios_testdriver_polled.c
+termios08_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_termios08) \
+	$(support_includes) -I$(top_srcdir)/termios03
+endif
+
+if TEST_termios09
+lib_tests += termios09
+lib_screens += termios09/termios09.scn
+lib_docs += termios09/termios09.doc
+termios09_SOURCES = termios09/init.c
+termios09_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_termios09) \
+	$(support_includes)
+endif
+
+if TEST_top
+lib_tests += top
+lib_screens += top/top.scn
+top_SOURCES = top/init.c top/task1.c top/task2.c top/task3.c \
+	top/system.h
+top_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_top) $(support_includes)
+endif
+
+if TEST_tztest
+lib_tests += tztest
+lib_screens += tztest/tztest.scn
+lib_docs += tztest/tztest.doc
+tztest_SOURCES = tztest/init.c
+tztest_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_tztest) \
+	$(support_includes)
+endif
+
+if TEST_uid01
+lib_tests += uid01
+lib_docs += uid01/uid01.doc
+uid01_SOURCES = uid01/init.c uid01/serial_mouse_config.c \
+	uid01/msmouse.c termios04/termios_testdriver_intr.c
+uid01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_uid01) \
+	$(support_includes) -I$(top_srcdir)/termios04
+endif
+
+if TEST_unlink
+lib_tests += unlink.norun
+unlink_norun_SOURCES = POSIX/unlink.c
+endif
+
+if TEST_utf8proc01
+lib_tests += utf8proc01
+lib_screens += utf8proc01/utf8proc01.scn
+lib_docs += utf8proc01/utf8proc01.doc
+utf8proc01_SOURCES = utf8proc01/init.c
+utf8proc01_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_utf8proc01) \
+	$(support_includes)
+endif
+
+if TEST_vfork
+lib_tests += vfork.norun
+vfork_norun_SOURCES = POSIX/vfork.c
+endif
+
+if TEST_wait
+lib_tests += wait.norun
+wait_norun_SOURCES = POSIX/wait.c
+endif
+
+if TEST_waitpid
+lib_tests += waitpid.norun
+waitpid_norun_SOURCES = POSIX/waitpid.c
+endif
+
+if TEST_write
+lib_tests += write.norun
+write_norun_SOURCES = POSIX/write.c
+endif
+
+if TEST_writev
+lib_tests += writev.norun
+writev_norun_SOURCES = POSIX/writev.c
+endif
+
+rtems_tests_PROGRAMS = $(lib_tests)
+dist_rtems_tests_DATA = $(lib_screens) $(lib_docs)
+
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/POSIX/Makefile.am b/testsuites/libtests/POSIX/Makefile.am
deleted file mode 100644
index 689fd391e6..0000000000
--- a/testsuites/libtests/POSIX/Makefile.am
+++ /dev/null
@@ -1,149 +0,0 @@
-CC = @CC@
-
-check_PROGRAMS =
-
-check_PROGRAMS += calloc
-calloc_SOURCES = calloc.c
-
-check_PROGRAMS += clock_gettime
-clock_gettime_SOURCES = clock_gettime.c
-
-check_PROGRAMS += close
-close_SOURCES = close.c
-
-check_PROGRAMS += dup2
-dup2_SOURCES = dup2.c
-
-check_PROGRAMS += fcntl
-fcntl_SOURCES = fcntl.c
-
-check_PROGRAMS += flockfile
-flockfile_SOURCES = flockfile.c
-
-check_PROGRAMS += fork
-fork_SOURCES = fork.c
-
-check_PROGRAMS += free
-free_SOURCES = free.c
-
-check_PROGRAMS += fstat
-fstat_SOURCES = fstat.c
-
-check_PROGRAMS += ftrylockfile
-ftrylockfile_SOURCES = ftrylockfile.c
-
-check_PROGRAMS += funlockfile
-funlockfile_SOURCES = funlockfile.c
-
-# FIXME: BSD-proprietary
-# check_PROGRAMS += getdents
-# getdents_SOURCES = getdents.c
-
-check_PROGRAMS += getlogin
-getlogin_SOURCES = getlogin.c
-
-check_PROGRAMS += getpwnam
-getpwnam_SOURCES = getpwnam.c
-
-check_PROGRAMS += getpwuid
-getpwuid_SOURCES = getpwuid.c
-
-check_PROGRAMS += gettimeofday
-gettimeofday_SOURCES = gettimeofday.c
-
-check_PROGRAMS += getuid
-getuid_SOURCES = getuid.c
-
-# FIXME: BSD-proprietary
-# check_PROGRAMS += issetugid
-# issetugid_SOURCES = issetugid.c
-
-check_PROGRAMS += htonl
-htonl_SOURCES = htonl.c
-
-check_PROGRAMS += iconv
-iconv_SOURCES = iconv.c
-
-check_PROGRAMS += iconv_close
-iconv_close_SOURCES = iconv_close.c
-
-check_PROGRAMS += iconv_open
-iconv_open_SOURCES = iconv_open.c
-
-check_PROGRAMS += lseek
-lseek_SOURCES = lseek.c
-
-check_PROGRAMS += longjmp
-longjmp_SOURCES = longjmp.c
-
-check_PROGRAMS += lstat
-lstat_SOURCES = lstat.c
-
-check_PROGRAMS += kill
-kill_SOURCES = kill.c
-
-check_PROGRAMS += malloc
-malloc_SOURCES = malloc.c
-
-check_PROGRAMS += nanosleep
-nanosleep_SOURCES = nanosleep.c
-
-check_PROGRAMS += open
-open_SOURCES = open.c
-
-check_PROGRAMS += pipe
-pipe_SOURCES = pipe.c
-
-check_PROGRAMS += posix_memalign
-posix_memalign_SOURCES = posix_memalign.c
-
-check_PROGRAMS += read
-read_SOURCES = read.c
-
-check_PROGRAMS += readv
-readv_SOURCES = readv.c
-
-check_PROGRAMS += realloc
-realloc_SOURCES = realloc.c
-
-check_PROGRAMS += setjmp
-setjmp_SOURCES = setjmp.c
-
-check_PROGRAMS += sigaddset
-sigaddset_SOURCES = sigaddset.c
-
-check_PROGRAMS += sigdelset
-sigdelset_SOURCES = sigdelset.c
-
-check_PROGRAMS += sigemptyset
-sigemptyset_SOURCES = sigemptyset.c
-
-check_PROGRAMS += sigfillset
-sigfillset_SOURCES = sigfillset.c
-
-check_PROGRAMS += sigismember
-sigismember = sigismember.c
-
-check_PROGRAMS += sigprocmask
-sigprocmask_SOURCES = sigprocmask.c
-
-check_PROGRAMS += stat
-stat_SOURCES = stat.c
-
-check_PROGRAMS += unlink
-unlink_SOURCES = unlink.c
-
-check_PROGRAMS += vfork
-vfork_SOURCES = vfork.c
-
-check_PROGRAMS += wait
-wait_SOURCES = wait.c
-
-check_PROGRAMS += waitpid
-waitpid_SOURCES = waitpid.c
-
-check_PROGRAMS += write
-write_SOURCES = write.c
-
-check_PROGRAMS += writev
-writev_SOURCES = writev.c
diff --git a/testsuites/libtests/block01/Makefile.am b/testsuites/libtests/block01/Makefile.am
deleted file mode 100644
index 44827ab142..0000000000
--- a/testsuites/libtests/block01/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = block01
-block01_SOURCES = init.c
-
-dist_rtems_tests_DATA = block01.scn block01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block01_OBJECTS)
-LINK_LIBS = $(block01_LDLIBS)
-
-block01$(EXEEXT): $(block01_OBJECTS) $(block01_DEPENDENCIES)
-	@rm -f block01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block02/Makefile.am b/testsuites/libtests/block02/Makefile.am
deleted file mode 100644
index 53e71dfe08..0000000000
--- a/testsuites/libtests/block02/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = block02
-block02_SOURCES = init.c
-
-dist_rtems_tests_DATA = block02.scn block02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block02_OBJECTS)
-LINK_LIBS = $(block02_LDLIBS)
-
-block02$(EXEEXT): $(block02_OBJECTS) $(block02_DEPENDENCIES)
-	@rm -f block02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block03/Makefile.am b/testsuites/libtests/block03/Makefile.am
deleted file mode 100644
index a6d1f78ac4..0000000000
--- a/testsuites/libtests/block03/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = block03
-block03_SOURCES = init.c
-
-dist_rtems_tests_DATA = block03.scn block03.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block03_OBJECTS)
-LINK_LIBS = $(block03_LDLIBS)
-
-block03$(EXEEXT): $(block03_OBJECTS) $(block03_DEPENDENCIES)
-	@rm -f block03$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block04/Makefile.am b/testsuites/libtests/block04/Makefile.am
deleted file mode 100644
index d50fb400b1..0000000000
--- a/testsuites/libtests/block04/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = block04
-block04_SOURCES = init.c
-
-dist_rtems_tests_DATA = block04.scn block04.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block04_OBJECTS)
-LINK_LIBS = $(block04_LDLIBS)
-
-block04$(EXEEXT): $(block04_OBJECTS) $(block04_DEPENDENCIES)
-	@rm -f block04$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block05/Makefile.am b/testsuites/libtests/block05/Makefile.am
deleted file mode 100644
index 2f97659d4b..0000000000
--- a/testsuites/libtests/block05/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = block05
-block05_SOURCES = init.c
-
-dist_rtems_tests_DATA = block05.scn block05.doc block05.png
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block05_OBJECTS)
-LINK_LIBS = $(block05_LDLIBS)
-
-block05$(EXEEXT): $(block05_OBJECTS) $(block05_DEPENDENCIES)
-	@rm -f block05$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block06/Makefile.am b/testsuites/libtests/block06/Makefile.am
deleted file mode 100644
index 39c7988b41..0000000000
--- a/testsuites/libtests/block06/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = block06
-block06_SOURCES = init.c
-
-dist_rtems_tests_DATA = block06.scn block06.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block06_OBJECTS)
-LINK_LIBS = $(block06_LDLIBS)
-
-block06$(EXEEXT): $(block06_OBJECTS) $(block06_DEPENDENCIES)
-	@rm -f block06$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block07/Makefile.am b/testsuites/libtests/block07/Makefile.am
deleted file mode 100644
index 696fde3d59..0000000000
--- a/testsuites/libtests/block07/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = block07
-block07_SOURCES = init.c
-
-dist_rtems_tests_DATA = block07.scn block07.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block07_OBJECTS)
-LINK_LIBS = $(block07_LDLIBS)
-
-block07$(EXEEXT): $(block07_OBJECTS) $(block07_DEPENDENCIES)
-	@rm -f block07$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block08/Makefile.am b/testsuites/libtests/block08/Makefile.am
deleted file mode 100644
index be5cf833ba..0000000000
--- a/testsuites/libtests/block08/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-##
-## Copyright (C) 2010 OKTET Labs, St.-Petersburg, Russia
-## Author: Oleg Kravtsov <Oleg.Kravtsov@oktetlabs.ru>
-##
-## The license and distribution terms for this file may be
-## found in the file LICENSE in this distribution or at
-## http://www.rtems.org/license/LICENSE.
-##
-
-
-rtems_tests_PROGRAMS = block08
-block08_SOURCES = init.c               \
-                       system.h        \
-                       bdbuf_tests.c   \
-	               bdbuf_tests.h   \
-		       test_disk.c     \
-		       bdbuf_test1_1.c \
-                       bdbuf_test1_2.c \
-                       bdbuf_test1_3.c \
-                       bdbuf_test1_4.c \
-                       bdbuf_test1_5.c \
-                       bdbuf_test2_1.c \
-                       bdbuf_test2_2.c \
-                       bdbuf_test3_1.c \
-                       bdbuf_test3_2.c \
-                       bdbuf_test3_3.c \
-                       bdbuf_test4_1.c \
-                       bdbuf_test4_2.c \
-                       bdbuf_test4_3.c
-
-dist_rtems_tests_DATA = block08.scn block08.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block08_OBJECTS)
-LINK_LIBS = $(block08_LDLIBS)
-
-block08$(EXEEXT): $(block08_OBJECTS) $(block08_DEPENDENCIES)
-	@rm -f block08$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block09/Makefile.am b/testsuites/libtests/block09/Makefile.am
deleted file mode 100644
index 821f5fcfc5..0000000000
--- a/testsuites/libtests/block09/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = block09
-block09_SOURCES = init.c
-
-dist_rtems_tests_DATA = block09.scn block09.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block09_OBJECTS)
-LINK_LIBS = $(block09_LDLIBS)
-
-block09$(EXEEXT): $(block09_OBJECTS) $(block09_DEPENDENCIES)
-	@rm -f block09$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block10/Makefile.am b/testsuites/libtests/block10/Makefile.am
deleted file mode 100644
index 2301e2be36..0000000000
--- a/testsuites/libtests/block10/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = block10
-block10_SOURCES = init.c
-
-dist_rtems_tests_DATA = block10.scn block10.doc block10.png
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block10_OBJECTS)
-LINK_LIBS = $(block10_LDLIBS)
-
-block10$(EXEEXT): $(block10_OBJECTS) $(block10_DEPENDENCIES)
-	@rm -f block10$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block11/Makefile.am b/testsuites/libtests/block11/Makefile.am
deleted file mode 100644
index 2c29b9156c..0000000000
--- a/testsuites/libtests/block11/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = block11
-block11_SOURCES = init.c
-
-dist_rtems_tests_DATA = block11.scn block11.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block11_OBJECTS)
-LINK_LIBS = $(block11_LDLIBS)
-
-block11$(EXEEXT): $(block11_OBJECTS) $(block11_DEPENDENCIES)
-	@rm -f block11$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block12/Makefile.am b/testsuites/libtests/block12/Makefile.am
deleted file mode 100644
index 510cd1c4e7..0000000000
--- a/testsuites/libtests/block12/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = block12
-block12_SOURCES = init.c
-
-dist_rtems_tests_DATA = block12.scn block12.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block12_OBJECTS)
-LINK_LIBS = $(block12_LDLIBS)
-
-block12$(EXEEXT): $(block12_OBJECTS) $(block12_DEPENDENCIES)
-	@rm -f block12$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block13/Makefile.am b/testsuites/libtests/block13/Makefile.am
deleted file mode 100644
index 9b4a76d0eb..0000000000
--- a/testsuites/libtests/block13/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = block13
-block13_SOURCES = init.c
-
-dist_rtems_tests_DATA = block13.scn block13.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block13_OBJECTS)
-LINK_LIBS = $(block13_LDLIBS)
-
-block13$(EXEEXT): $(block13_OBJECTS) $(block13_DEPENDENCIES)
-	@rm -f block13$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block14/Makefile.am b/testsuites/libtests/block14/Makefile.am
deleted file mode 100644
index a7769de3e0..0000000000
--- a/testsuites/libtests/block14/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = block14
-block14_SOURCES = init.c
-
-dist_rtems_tests_DATA = block14.scn block14.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block14_OBJECTS)
-LINK_LIBS = $(block14_LDLIBS)
-
-block14$(EXEEXT): $(block14_OBJECTS) $(block14_DEPENDENCIES)
-	@rm -f block14$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block15/Makefile.am b/testsuites/libtests/block15/Makefile.am
deleted file mode 100644
index 1acef6ea77..0000000000
--- a/testsuites/libtests/block15/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = block15
-block15_SOURCES = init.c
-
-dist_rtems_tests_DATA = block15.scn block15.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block15_OBJECTS)
-LINK_LIBS = $(block15_LDLIBS)
-
-block15$(EXEEXT): $(block15_OBJECTS) $(block15_DEPENDENCIES)
-	@rm -f block15$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block16/Makefile.am b/testsuites/libtests/block16/Makefile.am
deleted file mode 100644
index 37ca96b847..0000000000
--- a/testsuites/libtests/block16/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = block16
-block16_SOURCES = init.c
-
-dist_rtems_tests_DATA = block16.scn block16.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block16_OBJECTS)
-LINK_LIBS = $(block16_LDLIBS)
-
-block16$(EXEEXT): $(block16_OBJECTS) $(block16_DEPENDENCIES)
-	@rm -f block16$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/block17/Makefile.am b/testsuites/libtests/block17/Makefile.am
deleted file mode 100644
index b61d38d9e3..0000000000
--- a/testsuites/libtests/block17/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = block17
-block17_SOURCES = init.c
-
-dist_rtems_tests_DATA = block17.scn block17.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(block17_OBJECTS)
-LINK_LIBS = $(block17_LDLIBS)
-
-block17$(EXEEXT): $(block17_OBJECTS) $(block17_DEPENDENCIES)
-	@rm -f block17$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/bspcmdline01/Makefile.am b/testsuites/libtests/bspcmdline01/Makefile.am
deleted file mode 100644
index 4f361e3678..0000000000
--- a/testsuites/libtests/bspcmdline01/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = bspcmdline01
-bspcmdline01_SOURCES = init.c
-
-dist_rtems_tests_DATA = bspcmdline01.scn
-dist_rtems_tests_DATA += bspcmdline01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(bspcmdline01_OBJECTS)
-LINK_LIBS = $(bspcmdline01_LDLIBS)
-
-bspcmdline01$(EXEEXT): $(bspcmdline01_OBJECTS) $(bspcmdline01_DEPENDENCIES)
-	@rm -f bspcmdline01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/capture01/Makefile.am b/testsuites/libtests/capture01/Makefile.am
deleted file mode 100644
index c7698ddd40..0000000000
--- a/testsuites/libtests/capture01/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = capture01
-capture01_SOURCES = init.c test1.c system.h
-
-dist_rtems_tests_DATA = capture01.scn
-dist_rtems_tests_DATA += capture01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(capture01_OBJECTS)
-LINK_LIBS = $(capture01_LDLIBS)
-
-capture01$(EXEEXT): $(capture01_OBJECTS) $(capture01_DEPENDENCIES)
-	@rm -f capture01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/complex/Makefile.am b/testsuites/libtests/complex/Makefile.am
deleted file mode 100644
index a992d68079..0000000000
--- a/testsuites/libtests/complex/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-if HAS_COMPLEX
-rtems_tests_PROGRAMS = complex
-complex_SOURCES = init.c docomplex.c docomplexf.c docomplexl.c
-endif
-
-# FIXME: Skip long double, not yet supported in newlib
-complex_CPPFLAGS = $(AM_CPPFLAGS) -DNO_LONG_DOUBLE
-
-dist_rtems_tests_DATA = complex.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-if HAS_COMPLEX
-complex_LDADD = -lm
-
-LINK_OBJS = $(complex_OBJECTS) $(complex_LDADD)
-LINK_LIBS = $(complex_LDLIBS)
-
-complex$(EXEEXT): $(complex_OBJECTS) $(complex_DEPENDENCIES)
-	@rm -f complex$(EXEEXT)
-	$(make-exe)
-endif
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/configure.ac b/testsuites/libtests/configure.ac
index dc4602cbb2..253eb7c287 100644
--- a/testsuites/libtests/configure.ac
+++ b/testsuites/libtests/configure.ac
@@ -93,97 +93,142 @@ esac
 AC_MSG_RESULT([$TEST_LIBDEBUGGER])
 AM_CONDITIONAL(DEBUGGERTESTS,[test x"$TEST_LIBDEBUGGER" = x"yes"])
 
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
-POSIX/Makefile
-block01/Makefile
-block02/Makefile
-block03/Makefile
-block04/Makefile
-block05/Makefile
-block06/Makefile
-block07/Makefile
-block08/Makefile
-block09/Makefile
-block10/Makefile
-block11/Makefile
-block12/Makefile
-block13/Makefile
-block14/Makefile
-block15/Makefile
-block16/Makefile
-block17/Makefile
-bspcmdline01/Makefile
-capture01/Makefile
-complex/Makefile
-cpuuse/Makefile
-crypt01/Makefile
-debugger01/Makefile
-defaultconfig01/Makefile
-devfs01/Makefile
-devfs02/Makefile
-devfs03/Makefile
-devfs04/Makefile
-deviceio01/Makefile
-devnullfatal01/Makefile
-dl01/Makefile
-dl02/Makefile
-dl03/Makefile
-dl04/Makefile
-dl05/Makefile
-dumpbuf01/Makefile
-exit01/Makefile
-exit02/Makefile
-flashdisk01/Makefile
-ftp01/Makefile
-gxx01/Makefile
-heapwalk/Makefile
-i2c01/Makefile
-libfdt01/Makefile
-malloc02/Makefile
-malloc03/Makefile
-malloc04/Makefile
-malloctest/Makefile
-math/Makefile
-mathf/Makefile
-mathl/Makefile
-md501/Makefile
-mghttpd01/Makefile
-monitor/Makefile
-monitor02/Makefile
-mouse01/Makefile
-networking01/Makefile
-newlib01/Makefile
-putenvtest/Makefile
-pwdgrp01/Makefile
-pwdgrp02/Makefile
-getentropy01/Makefile
-rbheap01/Makefile
-rtmonuse/Makefile
-sha/Makefile
-shell01/Makefile
-sparsedisk01/Makefile
-spi01/Makefile
-stackchk/Makefile
-stackchk01/Makefile
-stringto01/Makefile
-syscall01/Makefile
-tar01/Makefile
-tar02/Makefile
-tar03/Makefile
-termios/Makefile
-termios01/Makefile
-termios02/Makefile
-termios03/Makefile
-termios04/Makefile
-termios05/Makefile
-termios06/Makefile
-termios07/Makefile
-termios08/Makefile
-termios09/Makefile
-top/Makefile
-tztest/Makefile
-uid01/Makefile
-utf8proc01/Makefile
-])
+# BSP Test configuration
+RTEMS_TEST_CHECK([block01])
+RTEMS_TEST_CHECK([block02])
+RTEMS_TEST_CHECK([block03])
+RTEMS_TEST_CHECK([block04])
+RTEMS_TEST_CHECK([block05])
+RTEMS_TEST_CHECK([block06])
+RTEMS_TEST_CHECK([block07])
+RTEMS_TEST_CHECK([block08])
+RTEMS_TEST_CHECK([block09])
+RTEMS_TEST_CHECK([block10])
+RTEMS_TEST_CHECK([block11])
+RTEMS_TEST_CHECK([block12])
+RTEMS_TEST_CHECK([block13])
+RTEMS_TEST_CHECK([block14])
+RTEMS_TEST_CHECK([block15])
+RTEMS_TEST_CHECK([block16])
+RTEMS_TEST_CHECK([block17])
+RTEMS_TEST_CHECK([bspcmdline01])
+RTEMS_TEST_CHECK([calloc])
+RTEMS_TEST_CHECK([capture01])
+RTEMS_TEST_CHECK([clock_gettime])
+RTEMS_TEST_CHECK([close])
+RTEMS_TEST_CHECK([complex])
+RTEMS_TEST_CHECK([cpuuse])
+RTEMS_TEST_CHECK([crypt01])
+RTEMS_TEST_CHECK([debugger01])
+RTEMS_TEST_CHECK([defaultconfig01])
+RTEMS_TEST_CHECK([devfs01])
+RTEMS_TEST_CHECK([devfs02])
+RTEMS_TEST_CHECK([devfs03])
+RTEMS_TEST_CHECK([devfs04])
+RTEMS_TEST_CHECK([deviceio01])
+RTEMS_TEST_CHECK([devnullfatal01])
+RTEMS_TEST_CHECK([dl01])
+RTEMS_TEST_CHECK([dl02])
+RTEMS_TEST_CHECK([dl03])
+RTEMS_TEST_CHECK([dl04])
+RTEMS_TEST_CHECK([dl05])
+RTEMS_TEST_CHECK([dumpbuf01])
+RTEMS_TEST_CHECK([dup2])
+RTEMS_TEST_CHECK([exit01])
+RTEMS_TEST_CHECK([exit02])
+RTEMS_TEST_CHECK([fcntl])
+RTEMS_TEST_CHECK([flashdisk01])
+RTEMS_TEST_CHECK([flockfile])
+RTEMS_TEST_CHECK([fork])
+RTEMS_TEST_CHECK([free])
+RTEMS_TEST_CHECK([fstat])
+RTEMS_TEST_CHECK([ftp01])
+RTEMS_TEST_CHECK([ftrylockfile])
+RTEMS_TEST_CHECK([funlockfile])
+RTEMS_TEST_CHECK([getentropy01])
+RTEMS_TEST_CHECK([getlogin])
+RTEMS_TEST_CHECK([getpwnam])
+RTEMS_TEST_CHECK([getpwuid])
+RTEMS_TEST_CHECK([gettimeofday])
+RTEMS_TEST_CHECK([getuid])
+RTEMS_TEST_CHECK([gxx01])
+RTEMS_TEST_CHECK([heapwalk])
+RTEMS_TEST_CHECK([htonl])
+RTEMS_TEST_CHECK([i2c01])
+RTEMS_TEST_CHECK([iconv])
+RTEMS_TEST_CHECK([iconv_close])
+RTEMS_TEST_CHECK([iconv_open])
+RTEMS_TEST_CHECK([kill])
+RTEMS_TEST_CHECK([libfdt01])
+RTEMS_TEST_CHECK([longjmp])
+RTEMS_TEST_CHECK([lseek])
+RTEMS_TEST_CHECK([lstat])
+RTEMS_TEST_CHECK([malloc])
+RTEMS_TEST_CHECK([malloc02])
+RTEMS_TEST_CHECK([malloc03])
+RTEMS_TEST_CHECK([malloc04])
+RTEMS_TEST_CHECK([malloctest])
+RTEMS_TEST_CHECK([math])
+RTEMS_TEST_CHECK([mathf])
+RTEMS_TEST_CHECK([mathl])
+RTEMS_TEST_CHECK([md501])
+RTEMS_TEST_CHECK([mghttpd01])
+RTEMS_TEST_CHECK([monitor])
+RTEMS_TEST_CHECK([monitor02])
+RTEMS_TEST_CHECK([mouse01])
+RTEMS_TEST_CHECK([nanosleep])
+RTEMS_TEST_CHECK([networking01])
+RTEMS_TEST_CHECK([newlib01])
+RTEMS_TEST_CHECK([open])
+RTEMS_TEST_CHECK([pipe])
+RTEMS_TEST_CHECK([posix_memalign])
+RTEMS_TEST_CHECK([putenvtest])
+RTEMS_TEST_CHECK([pwdgrp01])
+RTEMS_TEST_CHECK([pwdgrp02])
+RTEMS_TEST_CHECK([rbheap01])
+RTEMS_TEST_CHECK([read])
+RTEMS_TEST_CHECK([readv])
+RTEMS_TEST_CHECK([realloc])
+RTEMS_TEST_CHECK([rtmonuse])
+RTEMS_TEST_CHECK([setjmp])
+RTEMS_TEST_CHECK([sha])
+RTEMS_TEST_CHECK([shell01])
+RTEMS_TEST_CHECK([sigaddset])
+RTEMS_TEST_CHECK([sigdelset])
+RTEMS_TEST_CHECK([sigemptyset])
+RTEMS_TEST_CHECK([sigfillset])
+RTEMS_TEST_CHECK([sigismember])
+RTEMS_TEST_CHECK([sigprocmask])
+RTEMS_TEST_CHECK([sparsedisk01])
+RTEMS_TEST_CHECK([spi01])
+RTEMS_TEST_CHECK([stackchk])
+RTEMS_TEST_CHECK([stackchk01])
+RTEMS_TEST_CHECK([stat])
+RTEMS_TEST_CHECK([stringto01])
+RTEMS_TEST_CHECK([syscall01])
+RTEMS_TEST_CHECK([tar01])
+RTEMS_TEST_CHECK([tar02])
+RTEMS_TEST_CHECK([tar03])
+RTEMS_TEST_CHECK([termios])
+RTEMS_TEST_CHECK([termios01])
+RTEMS_TEST_CHECK([termios02])
+RTEMS_TEST_CHECK([termios03])
+RTEMS_TEST_CHECK([termios04])
+RTEMS_TEST_CHECK([termios05])
+RTEMS_TEST_CHECK([termios06])
+RTEMS_TEST_CHECK([termios07])
+RTEMS_TEST_CHECK([termios08])
+RTEMS_TEST_CHECK([termios09])
+RTEMS_TEST_CHECK([top])
+RTEMS_TEST_CHECK([tztest])
+RTEMS_TEST_CHECK([uid01])
+RTEMS_TEST_CHECK([unlink])
+RTEMS_TEST_CHECK([utf8proc01])
+RTEMS_TEST_CHECK([vfork])
+RTEMS_TEST_CHECK([wait])
+RTEMS_TEST_CHECK([waitpid])
+RTEMS_TEST_CHECK([write])
+RTEMS_TEST_CHECK([writev])
+
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/testsuites/libtests/cpuuse/Makefile.am b/testsuites/libtests/cpuuse/Makefile.am
deleted file mode 100644
index ce429aea8f..0000000000
--- a/testsuites/libtests/cpuuse/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = cpuuse
-cpuuse_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
-
-dist_rtems_tests_DATA = cpuuse.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(cpuuse_OBJECTS)
-LINK_LIBS = $(cpuuse_LDLIBS)
-
-cpuuse$(EXEEXT): $(cpuuse_OBJECTS) $(cpuuse_DEPENDENCIES)
-	@rm -f cpuuse$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/crypt01/Makefile.am b/testsuites/libtests/crypt01/Makefile.am
deleted file mode 100644
index 973f274ca5..0000000000
--- a/testsuites/libtests/crypt01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = crypt01
-crypt01_SOURCES = init.c
-
-dist_rtems_tests_DATA = crypt01.scn crypt01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(crypt01_OBJECTS)
-LINK_LIBS = $(crypt01_LDLIBS)
-
-crypt01$(EXEEXT): $(crypt01_OBJECTS) $(crypt01_DEPENDENCIES)
-	@rm -f crypt01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/debugger01/Makefile.am b/testsuites/libtests/debugger01/Makefile.am
deleted file mode 100644
index d0bf0f8c14..0000000000
--- a/testsuites/libtests/debugger01/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = debugger01
-debugger01_SOURCES = init.c remote.c system.h
-
-dist_rtems_tests_DATA = debugger01.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(debugger01_OBJECTS)
-LINK_LIBS = $(debugger01_LDLIBS)
-
-debugger01$(EXEEXT): $(debugger01_OBJECTS) $(debugger01_DEPENDENCIES)
-	@rm -f debugger01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/defaultconfig01/Makefile.am b/testsuites/libtests/defaultconfig01/Makefile.am
deleted file mode 100644
index ffa894abc2..0000000000
--- a/testsuites/libtests/defaultconfig01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = defaultconfig01
-defaultconfig01_SOURCES = init.c
-
-dist_rtems_tests_DATA = defaultconfig01.scn defaultconfig01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(defaultconfig01_OBJECTS)
-LINK_LIBS = $(defaultconfig01_LDLIBS)
-
-defaultconfig01$(EXEEXT): $(defaultconfig01_OBJECTS) $(defaultconfig01_DEPENDENCIES)
-	@rm -f defaultconfig01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/devfs01/Makefile.am b/testsuites/libtests/devfs01/Makefile.am
deleted file mode 100644
index 5be442d0fb..0000000000
--- a/testsuites/libtests/devfs01/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = devfs01
-devfs01_SOURCES = init.c
-
-dist_rtems_tests_DATA = devfs01.scn
-dist_rtems_tests_DATA += devfs01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(devfs01_OBJECTS)
-LINK_LIBS = $(devfs01_LDLIBS)
-
-devfs01$(EXEEXT): $(devfs01_OBJECTS) $(devfs01_DEPENDENCIES)
-	@rm -f devfs01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/devfs02/Makefile.am b/testsuites/libtests/devfs02/Makefile.am
deleted file mode 100644
index 80d7c2b3ff..0000000000
--- a/testsuites/libtests/devfs02/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-rtems_tests_PROGRAMS = devfs02
-devfs02_SOURCES = init.c
-
-dist_rtems_tests_DATA = devfs02.scn
-dist_rtems_tests_DATA += devfs02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(devfs02_OBJECTS)
-LINK_LIBS = $(devfs02_LDLIBS)
-
-devfs02$(EXEEXT): $(devfs02_OBJECTS) $(devfs02_DEPENDENCIES)
-	@rm -f devfs02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/devfs03/Makefile.am b/testsuites/libtests/devfs03/Makefile.am
deleted file mode 100644
index 0df0f30ec7..0000000000
--- a/testsuites/libtests/devfs03/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-rtems_tests_PROGRAMS = devfs03
-devfs03_SOURCES = init.c
-
-dist_rtems_tests_DATA = devfs03.scn
-dist_rtems_tests_DATA += devfs03.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(devfs03_OBJECTS)
-LINK_LIBS = $(devfs03_LDLIBS)
-
-devfs03$(EXEEXT): $(devfs03_OBJECTS) $(devfs03_DEPENDENCIES)
-	@rm -f devfs03$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/devfs04/Makefile.am b/testsuites/libtests/devfs04/Makefile.am
deleted file mode 100644
index 6b240e486c..0000000000
--- a/testsuites/libtests/devfs04/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-rtems_tests_PROGRAMS = devfs04
-devfs04_SOURCES = init.c test_driver.c
-devfs04_SOURCES += test_driver.h
-
-dist_rtems_tests_DATA = devfs04.scn
-dist_rtems_tests_DATA += devfs04.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(devfs04_OBJECTS)
-LINK_LIBS = $(devfs04_LDLIBS)
-
-devfs04$(EXEEXT): $(devfs04_OBJECTS) $(devfs04_DEPENDENCIES)
-	@rm -f devfs04$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/deviceio01/Makefile.am b/testsuites/libtests/deviceio01/Makefile.am
deleted file mode 100644
index 8c92a80a56..0000000000
--- a/testsuites/libtests/deviceio01/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-rtems_tests_PROGRAMS = deviceio01
-deviceio01_SOURCES = init.c test_driver.c
-deviceio01_SOURCES += test_driver.h
-
-dist_rtems_tests_DATA = deviceio01.scn
-dist_rtems_tests_DATA += deviceio01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(deviceio01_OBJECTS)
-LINK_LIBS = $(deviceio01_LDLIBS)
-
-deviceio01$(EXEEXT): $(deviceio01_OBJECTS) $(deviceio01_DEPENDENCIES)
-	@rm -f deviceio01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/devnullfatal01/Makefile.am b/testsuites/libtests/devnullfatal01/Makefile.am
deleted file mode 100644
index ad21dc00d4..0000000000
--- a/testsuites/libtests/devnullfatal01/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-rtems_tests_PROGRAMS = devnullfatal01
-devnullfatal01_SOURCES = ../../sptests/spfatal_support/init.c \
-    ../../sptests/spfatal_support/system.h testcase.h
-
-dist_rtems_tests_DATA = devnullfatal01.scn
-dist_rtems_tests_DATA += devnullfatal01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.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/spfatal_support
-
-LINK_OBJS = $(devnullfatal01_OBJECTS)
-LINK_LIBS = $(devnullfatal01_LDLIBS)
-
-devnullfatal01$(EXEEXT): $(devnullfatal01_OBJECTS) \
-    $(devnullfatal01_DEPENDENCIES)
-	@rm -f devnullfatal01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/dl01/Makefile.am b/testsuites/libtests/dl01/Makefile.am
deleted file mode 100644
index 8c5d6912d5..0000000000
--- a/testsuites/libtests/dl01/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-rtems_tests_PROGRAMS = dl01
-dl01_SOURCES = init.c dl-load.c dl-tar.c dl-tar.h
-
-BUILT_SOURCES = dl-tar.c dl-tar.h
-
-dist_rtems_tests_DATA = dl01.scn dl01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(dl01_OBJECTS)
-LINK_LIBS = $(dl01_LDLIBS)
-
-init.$(OBJEXT): dl-tar.h
-
-dl-o1.o: dl-o1.c
-
-dl.tar: dl-o1.o
-	@rm -f $@
-	$(PAX) -w -f $@ $<
-CLEANFILES += dl.tar
-
-dl-tar.c: dl.tar
-	$(BIN2C) -C $< $@
-CLEANFILES += dl-tar.c
-
-dl-tar.h: dl.tar
-	$(BIN2C) -H $< $@
-CLEANFILES += dl-tar.h
-
-dl01.pre: $(dl01_OBJECTS) $(dl01_DEPENDENCIES)
-	@rm -f dl01.pre
-	$(LINK_APP)
-
-dl-sym.o: dl01.pre
-	rtems-syms -e -c "$(CFLAGS)" -o $@ $<
-
-dl01$(EXEEXT):  $(dl01_OBJECTS) $(dl01_DEPENDENCIES) dl-sym.o
-	@rm -f dl01$(EXEEXT)
-	$(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
-		    -o $(basename $@)$(EXEEXT) $(LINK_OBJS) dl-sym.o $(LINK_LIBS)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/dl01/init.c b/testsuites/libtests/dl01/init.c
index 9b4a2ae687..14fe848e64 100644
--- a/testsuites/libtests/dl01/init.c
+++ b/testsuites/libtests/dl01/init.c
@@ -27,10 +27,10 @@ const char rtems_test_name[] = "libdl (RTL) 1";
 /* forward declarations to avoid warnings */
 static rtems_task Init(rtems_task_argument argument);
 
-#include "dl-tar.h"
+#include "dl01-tar.h"
 
-#define TARFILE_START dl_tar
-#define TARFILE_SIZE  dl_tar_size
+#define TARFILE_START dl01_tar
+#define TARFILE_SIZE  dl01_tar_size
 
 static int test(void)
 {
diff --git a/testsuites/libtests/dl02/Makefile.am b/testsuites/libtests/dl02/Makefile.am
deleted file mode 100644
index aa848e4247..0000000000
--- a/testsuites/libtests/dl02/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-rtems_tests_PROGRAMS = dl02
-dl02_SOURCES = init.c dl-load.c dl-tar.c dl-tar.h
-
-BUILT_SOURCES = dl-tar.c dl-tar.h
-
-dist_rtems_tests_DATA = dl02.scn dl02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(dl02_OBJECTS)
-LINK_LIBS = $(dl02_LDLIBS)
-
-init.$(OBJEXT): dl-tar.h
-
-dl-o1.o: dl-o1.c
-
-dl-o2.o: dl-o2.c
-
-dl.tar: dl-o1.o dl-o2.o
-	@rm -f $@
-	$(PAX) -w -f $@ $^
-CLEANFILES += dl.tar
-
-dl-tar.c: dl.tar
-	$(BIN2C) -C $< $@
-CLEANFILES += dl-tar.c
-
-dl-tar.h: dl.tar
-	$(BIN2C) -H $< $@
-CLEANFILES += dl-tar.h
-
-dl02.pre: $(dl02_OBJECTS) $(dl02_DEPENDENCIES)
-	@rm -f dl02.pre
-	$(LINK_APP)
-
-dl-sym.o: dl02.pre
-	rtems-syms -e -c "$(CFLAGS)" -o $@ $<
-
-dl02$(EXEEXT):  $(dl02_OBJECTS) $(dl02_DEPENDENCIES) dl-sym.o
-	@rm -f dl02$(EXEEXT)
-	$(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
-		    -o $(basename $@)$(EXEEXT) $(LINK_OBJS) dl-sym.o $(LINK_LIBS)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/dl02/init.c b/testsuites/libtests/dl02/init.c
index bab6b80045..2c06052cb7 100644
--- a/testsuites/libtests/dl02/init.c
+++ b/testsuites/libtests/dl02/init.c
@@ -27,10 +27,10 @@ const char rtems_test_name[] = "libdl (RTL) 2";
 /* forward declarations to avoid warnings */
 static rtems_task Init(rtems_task_argument argument);
 
-#include "dl-tar.h"
+#include "dl02-tar.h"
 
-#define TARFILE_START dl_tar
-#define TARFILE_SIZE  dl_tar_size
+#define TARFILE_START dl02_tar
+#define TARFILE_SIZE  dl02_tar_size
 
 static int test(void)
 {
diff --git a/testsuites/libtests/dl03/Makefile.am b/testsuites/libtests/dl03/Makefile.am
deleted file mode 100644
index de8a79a4ed..0000000000
--- a/testsuites/libtests/dl03/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = dl03
-dl03_SOURCES = init.c dl-cache.c
-
-dist_rtems_tests_DATA = dl03.scn dl03.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(dl03_OBJECTS)
-LINK_LIBS = $(dl03_LDLIBS)
-
-dl03$(EXEEXT):  $(dl03_OBJECTS) $(dl03_DEPENDENCIES)
-	@rm -f dl03$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/dl04/Makefile.am b/testsuites/libtests/dl04/Makefile.am
deleted file mode 100644
index 7dbc5438e8..0000000000
--- a/testsuites/libtests/dl04/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-rtems_tests_PROGRAMS = dl04
-# include a C++ file in the source to trick automake into adding C++ rules <sigh>.
-dl04_SOURCES = init.c dl-load.c dl-cpp.cpp dl-tar.c dl-tar.h
-
-BUILT_SOURCES = dl-tar.c dl-tar.h
-
-dist_rtems_tests_DATA = dl04.scn dl04.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(dl04_OBJECTS)
-LINK_LIBS = $(dl04_LDLIBS)
-
-init.$(OBJEXT): dl-tar.h
-
-dl-o4.o: dl-o4.cpp
-
-dl.tar: dl-o4.o
-	@rm -f $@
-	$(PAX) -w -f $@ $<
-CLEANFILES += dl.tar
-
-dl-tar.c: dl.tar
-	$(BIN2C) -C $< $@
-CLEANFILES += dl-tar.c
-
-dl-tar.h: dl.tar
-	$(BIN2C) -H $< $@
-CLEANFILES += dl-tar.h
-
-dl04.pre: $(dl04_OBJECTS) $(dl04_DEPENDENCIES)
-	@rm -f dl04.pre
-	$(LINK_APP)
-
-dl-sym.o: dl04.pre
-	rtems-syms -e -c "$(CFLAGS)" -o $@ $<
-
-dl04$(EXEEXT):  $(dl04_OBJECTS) $(dl04_DEPENDENCIES) dl-sym.o
-	@rm -f dl04$(EXEEXT)
-	$(LINK.c) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
-		    -o $(basename $@)$(EXEEXT) $(LINK_OBJS) dl-sym.o $(LINK_LIBS)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/dl04/init.c b/testsuites/libtests/dl04/init.c
index 7b1bb1b35c..61630ff442 100644
--- a/testsuites/libtests/dl04/init.c
+++ b/testsuites/libtests/dl04/init.c
@@ -27,10 +27,10 @@ const char rtems_test_name[] = "libdl (RTL) 4";
 /* forward declarations to avoid warnings */
 static rtems_task Init(rtems_task_argument argument);
 
-#include "dl-tar.h"
+#include "dl04-tar.h"
 
-#define TARFILE_START dl_tar
-#define TARFILE_SIZE  dl_tar_size
+#define TARFILE_START dl04_tar
+#define TARFILE_SIZE  dl04_tar_size
 
 static int test(void)
 {
diff --git a/testsuites/libtests/dl05/Makefile.am b/testsuites/libtests/dl05/Makefile.am
deleted file mode 100644
index 8d2ddee638..0000000000
--- a/testsuites/libtests/dl05/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-rtems_tests_PROGRAMS = dl05
-dl05_SOURCES = init.c dl-load.c dl-cpp.cpp dl-tar.c dl-tar.h
-
-BUILT_SOURCES = dl-tar.c dl-tar.h
-
-dist_rtems_tests_DATA = dl05.scn dl05.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(dl05_OBJECTS)
-LINK_LIBS = $(dl05_LDLIBS)
-
-init.$(OBJEXT): dl-tar.h
-
-dl-o5.o: dl-o5.cpp
-
-dl.tar: dl-o5.o
-	@rm -f $@
-	$(PAX) -w -f $@ $<
-CLEANFILES += dl.tar
-
-dl-tar.c: dl.tar
-	$(BIN2C) -C $< $@
-CLEANFILES += dl-tar.c
-
-dl-tar.h: dl.tar
-	$(BIN2C) -H $< $@
-CLEANFILES += dl-tar.h
-
-dl05.pre: $(dl05_OBJECTS) $(dl05_DEPENDENCIES)
-	@rm -f dl05.pre
-	$(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
-		    -o $@ $(LINK_OBJS) $(LINK_LIBS)
-
-dl-sym.o: dl05.pre
-	rtems-syms -e -c "$(CFLAGS)" -o $@ $<
-
-dl05$(EXEEXT):  $(dl05_OBJECTS) $(dl05_DEPENDENCIES) dl-sym.o
-	@rm -f dl05$(EXEEXT)
-	$(LINK.cc) $(CPU_CFLAGS) $(AM_CFLAGS) $(AM_LDFLAGS) \
-		    -o $(basename $@)$(EXEEXT) $(LINK_OBJS) dl-sym.o $(LINK_LIBS)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/dl05/init.c b/testsuites/libtests/dl05/init.c
index cb19de13f2..028aae6039 100644
--- a/testsuites/libtests/dl05/init.c
+++ b/testsuites/libtests/dl05/init.c
@@ -27,10 +27,10 @@ const char rtems_test_name[] = "libdl (RTL) 5";
 /* forward declarations to avoid warnings */
 static rtems_task Init(rtems_task_argument argument);
 
-#include "dl-tar.h"
+#include "dl05-tar.h"
 
-#define TARFILE_START dl_tar
-#define TARFILE_SIZE  dl_tar_size
+#define TARFILE_START dl05_tar
+#define TARFILE_SIZE  dl05_tar_size
 
 static int test(void)
 {
diff --git a/testsuites/libtests/dumpbuf01/Makefile.am b/testsuites/libtests/dumpbuf01/Makefile.am
deleted file mode 100644
index 6026634ed1..0000000000
--- a/testsuites/libtests/dumpbuf01/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = dumpbuf01
-dumpbuf01_SOURCES = init.c
-
-dist_rtems_tests_DATA = dumpbuf01.scn
-dist_rtems_tests_DATA += dumpbuf01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(dumpbuf01_OBJECTS)
-LINK_LIBS = $(dumpbuf01_LDLIBS)
-
-dumpbuf01$(EXEEXT): $(dumpbuf01_OBJECTS) $(dumpbuf01_DEPENDENCIES)
-	@rm -f dumpbuf01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/exit01/Makefile.am b/testsuites/libtests/exit01/Makefile.am
deleted file mode 100644
index c1fd3bd1a9..0000000000
--- a/testsuites/libtests/exit01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = exit01
-exit01_SOURCES = init.c
-
-dist_rtems_tests_DATA = exit01.scn exit01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(exit01_OBJECTS)
-LINK_LIBS = $(exit01_LDLIBS)
-
-exit01$(EXEEXT): $(exit01_OBJECTS) $(exit01_DEPENDENCIES)
-	@rm -f exit01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/exit02/Makefile.am b/testsuites/libtests/exit02/Makefile.am
deleted file mode 100644
index bb08696711..0000000000
--- a/testsuites/libtests/exit02/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = exit02
-exit02_SOURCES = init.c
-
-dist_rtems_tests_DATA = exit02.scn exit02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(exit02_OBJECTS)
-LINK_LIBS = $(exit02_LDLIBS)
-
-exit02$(EXEEXT): $(exit02_OBJECTS) $(exit02_DEPENDENCIES)
-	@rm -f exit02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/flashdisk01/Makefile.am b/testsuites/libtests/flashdisk01/Makefile.am
deleted file mode 100644
index fd34fe6d8c..0000000000
--- a/testsuites/libtests/flashdisk01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = flashdisk01
-flashdisk01_SOURCES = init.c test-file-system.c
-
-dist_rtems_tests_DATA = flashdisk01.scn flashdisk01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(flashdisk01_OBJECTS)
-LINK_LIBS = $(flashdisk01_LDLIBS)
-
-flashdisk01$(EXEEXT): $(flashdisk01_OBJECTS) $(flashdisk01_DEPENDENCIES)
-	@rm -f flashdisk01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/ftp01/Makefile.am b/testsuites/libtests/ftp01/Makefile.am
deleted file mode 100644
index 4a0fd4efe6..0000000000
--- a/testsuites/libtests/ftp01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = ftp01
-ftp01_SOURCES = init.c
-ftp01_LDADD = -lftpd
-
-dist_rtems_tests_DATA = ftp01.scn
-dist_rtems_tests_DATA += ftp01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
-
-LINK_OBJS = $(ftp01_OBJECTS) $(ftp01_LDADD)
-LINK_LIBS = $(ftp01_LDLIBS)
-
-ftp01$(EXEEXT): $(ftp01_OBJECTS) $(ftp01_DEPENDENCIES)
-	@rm -f ftp01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/getentropy01/Makefile.am b/testsuites/libtests/getentropy01/Makefile.am
deleted file mode 100644
index 19ae137e43..0000000000
--- a/testsuites/libtests/getentropy01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = getentropy01
-getentropy01_SOURCES = init.c
-
-dist_rtems_tests_DATA = getentropy01.scn getentropy01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(getentropy01_OBJECTS)
-LINK_LIBS = $(getentropy01_LDLIBS)
-
-getentropy01$(EXEEXT): $(getentropy01_OBJECTS) $(getentropy01_DEPENDENCIES)
-	@rm -f getentropy01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/gxx01/Makefile.am b/testsuites/libtests/gxx01/Makefile.am
deleted file mode 100644
index 941751d63c..0000000000
--- a/testsuites/libtests/gxx01/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = gxx01
-gxx01_SOURCES = init.c
-
-dist_rtems_tests_DATA = gxx01.scn
-dist_rtems_tests_DATA += gxx01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(gxx01_OBJECTS)
-LINK_LIBS = $(gxx01_LDLIBS)
-
-gxx01$(EXEEXT): $(gxx01_OBJECTS) $(gxx01_DEPENDENCIES)
-	@rm -f gxx01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/heapwalk/Makefile.am b/testsuites/libtests/heapwalk/Makefile.am
deleted file mode 100644
index fee87ec6ff..0000000000
--- a/testsuites/libtests/heapwalk/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = heapwalk
-heapwalk_SOURCES = init.c system.h
-
-dist_rtems_tests_DATA = heapwalk.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(heapwalk_OBJECTS)
-LINK_LIBS = $(heapwalk_LDLIBS)
-
-heapwalk$(EXEEXT): $(heapwalk_OBJECTS) $(heapwalk_DEPENDENCIES)
-	@rm -f heapwalk$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/i2c01/Makefile.am b/testsuites/libtests/i2c01/Makefile.am
deleted file mode 100644
index f329337057..0000000000
--- a/testsuites/libtests/i2c01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = i2c01
-i2c01_SOURCES = init.c
-
-dist_rtems_tests_DATA = i2c01.scn i2c01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(i2c01_OBJECTS)
-LINK_LIBS = $(i2c01_LDLIBS)
-
-i2c01$(EXEEXT): $(i2c01_OBJECTS) $(i2c01_DEPENDENCIES)
-	@rm -f i2c01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/libfdt01/Makefile.am b/testsuites/libtests/libfdt01/Makefile.am
deleted file mode 100644
index 10a4be6821..0000000000
--- a/testsuites/libtests/libfdt01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = libfdt01
-libfdt01_SOURCES = init.c some.c
-
-dist_rtems_tests_DATA = libfdt01.scn libfdt01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(libfdt01_OBJECTS)
-LINK_LIBS = $(libfdt01_LDLIBS)
-
-libfdt01$(EXEEXT): $(libfdt01_OBJECTS) $(libfdt01_DEPENDENCIES)
-	@rm -f libfdt01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/malloc02/Makefile.am b/testsuites/libtests/malloc02/Makefile.am
deleted file mode 100644
index a3bd2ba487..0000000000
--- a/testsuites/libtests/malloc02/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = malloc02
-malloc02_SOURCES = init.c
-
-dist_rtems_tests_DATA = malloc02.scn
-dist_rtems_tests_DATA += malloc02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(malloc02_OBJECTS)
-LINK_LIBS = $(malloc02_LDLIBS)
-
-malloc02$(EXEEXT): $(malloc02_OBJECTS) $(malloc02_DEPENDENCIES)
-	@rm -f malloc02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/malloc03/Makefile.am b/testsuites/libtests/malloc03/Makefile.am
deleted file mode 100644
index ac5cee1440..0000000000
--- a/testsuites/libtests/malloc03/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = malloc03
-malloc03_SOURCES = init.c
-
-dist_rtems_tests_DATA = malloc03.scn
-dist_rtems_tests_DATA += malloc03.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(malloc03_OBJECTS)
-LINK_LIBS = $(malloc03_LDLIBS)
-
-malloc03$(EXEEXT): $(malloc03_OBJECTS) $(malloc03_DEPENDENCIES)
-	@rm -f malloc03$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/malloc04/Makefile.am b/testsuites/libtests/malloc04/Makefile.am
deleted file mode 100644
index a5a4b785da..0000000000
--- a/testsuites/libtests/malloc04/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = malloc04
-malloc04_SOURCES = init.c
-
-dist_rtems_tests_DATA = malloc04.scn
-dist_rtems_tests_DATA += malloc04.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(malloc04_OBJECTS)
-LINK_LIBS = $(malloc04_LDLIBS)
-
-malloc04$(EXEEXT): $(malloc04_OBJECTS) $(malloc04_DEPENDENCIES)
-	@rm -f malloc04$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/malloctest/Makefile.am b/testsuites/libtests/malloctest/Makefile.am
deleted file mode 100644
index 8fd0cd9e20..0000000000
--- a/testsuites/libtests/malloctest/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = malloctest
-malloctest_SOURCES = init.c task1.c system.h
-
-dist_rtems_tests_DATA = malloctest.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(malloctest_OBJECTS)
-LINK_LIBS = $(malloctest_LDLIBS)
-
-malloctest$(EXEEXT): $(malloctest_OBJECTS) $(malloctest_DEPENDENCIES)
-	@rm -f malloctest$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/math/Makefile.am b/testsuites/libtests/math/Makefile.am
deleted file mode 100644
index ec5c327d24..0000000000
--- a/testsuites/libtests/math/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-rtems_tests_PROGRAMS = math
-math_SOURCES = init.c domath.c
-
-dist_rtems_tests_DATA = math.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-math_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/math
-math_LDADD = -lm
-
-LINK_OBJS = $(math_OBJECTS) $(math_LDADD)
-LINK_LIBS = $(math_LDLIBS)
-
-math$(EXEEXT): $(math_OBJECTS) $(math_DEPENDENCIES)
-	@rm -f math$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/mathf/Makefile.am b/testsuites/libtests/mathf/Makefile.am
deleted file mode 100644
index f17f17c450..0000000000
--- a/testsuites/libtests/mathf/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-rtems_tests_PROGRAMS = mathf
-mathf_SOURCES = init.c domathf.c
-
-dist_rtems_tests_DATA = mathf.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-mathf_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/math
-mathf_LDADD = -lm
-
-LINK_OBJS = $(mathf_OBJECTS) $(mathf_LDADD)
-LINK_LIBS = $(mathf_LDLIBS)
-
-mathf$(EXEEXT): $(mathf_OBJECTS) $(mathf_DEPENDENCIES)
-	@rm -f mathf$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/mathl/Makefile.am b/testsuites/libtests/mathl/Makefile.am
deleted file mode 100644
index 2364a3bfcf..0000000000
--- a/testsuites/libtests/mathl/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-rtems_tests_PROGRAMS = mathl
-mathl_SOURCES = init.c domathl.c
-
-# FIXME: Skip long double, not yet supported in newlib
-# => This test currently is a nop
-mathl_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/math -DNO_LONG_DOUBLE
-
-dist_rtems_tests_DATA = mathl.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-mathl_LDADD = -lm
-
-LINK_OBJS = $(mathl_OBJECTS) $(mathl_LDADD)
-LINK_LIBS = $(mathl_LDLIBS)
-
-mathl$(EXEEXT): $(mathl_OBJECTS) $(mathl_DEPENDENCIES)
-	@rm -f mathl$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/md501/Makefile.am b/testsuites/libtests/md501/Makefile.am
deleted file mode 100644
index 5751738069..0000000000
--- a/testsuites/libtests/md501/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = md501
-md501_SOURCES = init.c
-
-dist_rtems_tests_DATA = md501.scn md501.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(md501_OBJECTS)
-LINK_LIBS = $(md501_LDLIBS)
-
-md501$(EXEEXT): $(md501_OBJECTS) $(md501_DEPENDENCIES)
-	@rm -f md501$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/mghttpd01/Makefile.am b/testsuites/libtests/mghttpd01/Makefile.am
deleted file mode 100644
index d3c89d86ca..0000000000
--- a/testsuites/libtests/mghttpd01/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-rtems_tests_PROGRAMS = mghttpd01
-
-mghttpd01_SOURCES = init.c init_fs.c init_fs.h \
-	test-http-client.c test-http-client.h
-mghttpd01_LDADD = -lmghttpd
-BUILT_SOURCES = init_fs.c init_fs.h
-
-dist_rtems_tests_DATA = mghttpd01.scn mghttpd01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
-
-LINK_OBJS = $(mghttpd01_OBJECTS) $(mghttpd01_LDADD)
-LINK_LIBS = $(mghttpd01_LDLIBS)
-
-mghttpd01$(EXEEXT): $(mghttpd01_OBJECTS) $(mghttpd01_DEPENDENCIES)
-	@rm -f mghttpd01$(EXEEXT)
-	$(make-exe)
-
-init.$(OBJEXT): init_fs.h
-
-init_fs.c:
-	$(BIN2C) -C $(srcdir)/init_fs.tar init_fs
-CLEANFILES += init_fs.c
-
-init_fs.h:
-	$(BIN2C) -H $(srcdir)/init_fs.tar init_fs
-CLEANFILES += init_fs.h
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/mghttpd01/init.c b/testsuites/libtests/mghttpd01/init.c
index d3f18feb63..77b52d9168 100644
--- a/testsuites/libtests/mghttpd01/init.c
+++ b/testsuites/libtests/mghttpd01/init.c
@@ -28,14 +28,14 @@
 
 #include <rtems/imfs.h>
 #include <rtems/error.h>
-#include "init_fs.h"
+#include "mghttpd01_tar.h"
 
 #include "test-http-client.h"
 
 const char rtems_test_name[] = "MGHTTPD 1";
 
-#define TARFILE_START init_fs_tar
-#define TARFILE_SIZE  init_fs_tar_size
+#define TARFILE_START mghttpd01_tar
+#define TARFILE_SIZE  mghttpd01_tar_size
 
 #define CBACKTEST_URI   "/callbacktest.txt"
 #define CBACKTEST_TXT   "HTTP/1.1 200 OK\r\n" \
@@ -264,7 +264,7 @@ static void Init(rtems_task_argument arg)
 
   TEST_END();
 
-  rtems_test_exit(0); 
+  rtems_test_exit(0);
 }
 
 #define CONFIGURE_APPLICATION_NEEDS_CLOCK_DRIVER
diff --git a/testsuites/libtests/mghttpd01/init_fs.tar b/testsuites/libtests/mghttpd01/init_fs.tar
deleted file mode 100644
index 67132d5122..0000000000
Binary files a/testsuites/libtests/mghttpd01/init_fs.tar and /dev/null differ
diff --git a/testsuites/libtests/mghttpd01/mghttpd01.tar b/testsuites/libtests/mghttpd01/mghttpd01.tar
new file mode 100644
index 0000000000..67132d5122
Binary files /dev/null and b/testsuites/libtests/mghttpd01/mghttpd01.tar differ
diff --git a/testsuites/libtests/monitor/Makefile.am b/testsuites/libtests/monitor/Makefile.am
deleted file mode 100644
index a9fb21d5ca..0000000000
--- a/testsuites/libtests/monitor/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-
-rtems_tests_PROGRAMS = monitor
-monitor_SOURCES = init.c system.h
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(monitor_OBJECTS)
-LINK_LIBS = $(monitor_LDLIBS)
-
-monitor$(EXEEXT): $(monitor_OBJECTS) $(monitor_DEPENDENCIES)
-	@rm -f monitor$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/monitor02/Makefile.am b/testsuites/libtests/monitor02/Makefile.am
deleted file mode 100644
index 897875dc34..0000000000
--- a/testsuites/libtests/monitor02/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = monitor02
-monitor02_SOURCES = init.c system.h
-
-dist_rtems_tests_DATA = monitor02.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(monitor02_OBJECTS)
-LINK_LIBS = $(monitor02_LDLIBS)
-
-monitor02$(EXEEXT): $(monitor02_OBJECTS) $(monitor02_DEPENDENCIES)
-	@rm -f monitor02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/mouse01/Makefile.am b/testsuites/libtests/mouse01/Makefile.am
deleted file mode 100644
index 3488f637b7..0000000000
--- a/testsuites/libtests/mouse01/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = mouse01
-mouse01_SOURCES = init.c serial_mouse_config.c msmouse.c\
-    ../termios04/termios_testdriver_intr.c
-
-dist_rtems_tests_DATA = mouse01.scn
-dist_rtems_tests_DATA += mouse01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.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)/termios04
-
-LINK_OBJS = $(mouse01_OBJECTS)
-LINK_LIBS = $(mouse01_LDLIBS)
-
-mouse01$(EXEEXT): $(mouse01_OBJECTS) $(mouse01_DEPENDENCIES)
-	@rm -f mouse01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/networking01/Makefile.am b/testsuites/libtests/networking01/Makefile.am
deleted file mode 100644
index 3bc93cebd7..0000000000
--- a/testsuites/libtests/networking01/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = networking01
-networking01_SOURCES = init.c
-
-dist_rtems_tests_DATA = networking01.scn
-dist_rtems_tests_DATA += networking01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
-
-LINK_OBJS = $(networking01_OBJECTS)
-LINK_LIBS = $(networking01_LDLIBS)
-
-networking01$(EXEEXT): $(networking01_OBJECTS) $(networking01_DEPENDENCIES)
-	@rm -f networking01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/newlib01/Makefile.am b/testsuites/libtests/newlib01/Makefile.am
deleted file mode 100644
index f30c117a8f..0000000000
--- a/testsuites/libtests/newlib01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = newlib01
-newlib01_SOURCES = init.c
-
-dist_rtems_tests_DATA = newlib01.scn newlib01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(newlib01_OBJECTS)
-LINK_LIBS = $(newlib01_LDLIBS)
-
-newlib01$(EXEEXT): $(newlib01_OBJECTS) $(newlib01_DEPENDENCIES)
-	@rm -f newlib01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/putenvtest/Makefile.am b/testsuites/libtests/putenvtest/Makefile.am
deleted file mode 100644
index 577b8d4f06..0000000000
--- a/testsuites/libtests/putenvtest/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = putenvtest
-putenvtest_SOURCES = init.c
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-dist_rtems_tests_DATA = putenvtest.scn
-#dist_rtems_tests_DATA = putenvtest.doc
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(putenvtest_OBJECTS)
-LINK_LIBS = $(putenvtest_LDLIBS)
-
-putenvtest$(EXEEXT): $(putenvtest_OBJECTS) $(putenvtest_DEPENDENCIES)
-	@rm -f putenvtest$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/pwdgrp01/Makefile.am b/testsuites/libtests/pwdgrp01/Makefile.am
deleted file mode 100644
index e624b26171..0000000000
--- a/testsuites/libtests/pwdgrp01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = pwdgrp01
-pwdgrp01_SOURCES = init.c
-
-dist_rtems_tests_DATA = pwdgrp01.scn pwdgrp01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(pwdgrp01_OBJECTS)
-LINK_LIBS = $(pwdgrp01_LDLIBS)
-
-pwdgrp01$(EXEEXT): $(pwdgrp01_OBJECTS) $(pwdgrp01_DEPENDENCIES)
-	@rm -f pwdgrp01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/pwdgrp02/Makefile.am b/testsuites/libtests/pwdgrp02/Makefile.am
deleted file mode 100644
index 10ce651367..0000000000
--- a/testsuites/libtests/pwdgrp02/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = pwdgrp02
-pwdgrp02_SOURCES = init.c
-
-dist_rtems_tests_DATA = pwdgrp02.scn pwdgrp02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(pwdgrp02_OBJECTS)
-LINK_LIBS = $(pwdgrp02_LDLIBS)
-
-pwdgrp02$(EXEEXT): $(pwdgrp02_OBJECTS) $(pwdgrp02_DEPENDENCIES)
-	@rm -f pwdgrp02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/rbheap01/Makefile.am b/testsuites/libtests/rbheap01/Makefile.am
deleted file mode 100644
index 9bad9c0759..0000000000
--- a/testsuites/libtests/rbheap01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = rbheap01
-rbheap01_SOURCES = init.c
-
-dist_rtems_tests_DATA = rbheap01.scn rbheap01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(rbheap01_OBJECTS)
-LINK_LIBS = $(rbheap01_LDLIBS)
-
-rbheap01$(EXEEXT): $(rbheap01_OBJECTS) $(rbheap01_DEPENDENCIES)
-	@rm -f rbheap01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/rtmonuse/Makefile.am b/testsuites/libtests/rtmonuse/Makefile.am
deleted file mode 100644
index eb37a40efc..0000000000
--- a/testsuites/libtests/rtmonuse/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = rtmonuse
-rtmonuse_SOURCES = init.c getall.c task1.c system.h
-
-dist_rtems_tests_DATA = rtmonuse.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(rtmonuse_OBJECTS)
-LINK_LIBS = $(rtmonuse_LDLIBS)
-
-rtmonuse$(EXEEXT): $(rtmonuse_OBJECTS) $(rtmonuse_DEPENDENCIES)
-	@rm -f rtmonuse$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/sha/Makefile.am b/testsuites/libtests/sha/Makefile.am
deleted file mode 100644
index c8ad362272..0000000000
--- a/testsuites/libtests/sha/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = sha
-sha_SOURCES = init.c
-
-dist_rtems_tests_DATA = sha.scn sha.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(sha_OBJECTS)
-LINK_LIBS = $(sha_LDLIBS)
-
-sha$(EXEEXT): $(sha_OBJECTS) $(sha_DEPENDENCIES)
-	@rm -f sha$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/shell01/Makefile.am b/testsuites/libtests/shell01/Makefile.am
deleted file mode 100644
index c44ba8fda0..0000000000
--- a/testsuites/libtests/shell01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = shell01
-shell01_SOURCES = init.c
-
-dist_rtems_tests_DATA = shell01.scn shell01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(shell01_OBJECTS)
-LINK_LIBS = $(shell01_LDLIBS)
-
-shell01$(EXEEXT): $(shell01_OBJECTS) $(shell01_DEPENDENCIES)
-	@rm -f shell01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/sparsedisk01/Makefile.am b/testsuites/libtests/sparsedisk01/Makefile.am
deleted file mode 100644
index 3a836c84a7..0000000000
--- a/testsuites/libtests/sparsedisk01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = sparsedisk01
-sparsedisk01_SOURCES = init.c
-
-dist_rtems_tests_DATA = sparsedisk01.scn sparsedisk01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(sparsedisk01_OBJECTS)
-LINK_LIBS = $(sparsedisk01_LDLIBS)
-
-sparsedisk01$(EXEEXT): $(sparsedisk01_OBJECTS) $(sparsedisk01_DEPENDENCIES)
-	@rm -f sparsedisk01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/spi01/Makefile.am b/testsuites/libtests/spi01/Makefile.am
deleted file mode 100644
index 170e08d531..0000000000
--- a/testsuites/libtests/spi01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = spi01
-spi01_SOURCES = init.c
-
-dist_rtems_tests_DATA = spi01.scn spi01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(spi01_OBJECTS)
-LINK_LIBS = $(spi01_LDLIBS)
-
-spi01$(EXEEXT): $(spi01_OBJECTS) $(spi01_DEPENDENCIES)
-	@rm -f spi01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/stackchk/Makefile.am b/testsuites/libtests/stackchk/Makefile.am
deleted file mode 100644
index 7c6525ee96..0000000000
--- a/testsuites/libtests/stackchk/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = stackchk
-stackchk_SOURCES = blow.c init.c task1.c system.h
-
-dist_rtems_tests_DATA = stackchk.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(stackchk_OBJECTS)
-LINK_LIBS = $(stackchk_LDLIBS)
-
-stackchk$(EXEEXT): $(stackchk_OBJECTS) $(stackchk_DEPENDENCIES)
-	@rm -f stackchk$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/stackchk01/Makefile.am b/testsuites/libtests/stackchk01/Makefile.am
deleted file mode 100644
index 9f2e5f6929..0000000000
--- a/testsuites/libtests/stackchk01/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = stackchk01
-stackchk01_SOURCES = init.c
-
-dist_rtems_tests_DATA = stackchk01.scn
-dist_rtems_tests_DATA += stackchk01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(stackchk01_OBJECTS)
-LINK_LIBS = $(stackchk01_LDLIBS)
-
-stackchk01$(EXEEXT): $(stackchk01_OBJECTS) $(stackchk01_DEPENDENCIES)
-	@rm -f stackchk01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/stringto01/Makefile.am b/testsuites/libtests/stringto01/Makefile.am
deleted file mode 100644
index cc638a239e..0000000000
--- a/testsuites/libtests/stringto01/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = stringto01
-stringto01_SOURCES = init.c
-stringto01_SOURCES += stringto_test_template.h
-
-dist_rtems_tests_DATA = stringto01.scn stringto01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(stringto01_OBJECTS)
-LINK_LIBS = $(stringto01_LDLIBS)
-
-stringto01$(EXEEXT): $(stringto01_OBJECTS) $(stringto01_DEPENDENCIES)
-	@rm -f stringto01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/syscall01/Makefile.am b/testsuites/libtests/syscall01/Makefile.am
deleted file mode 100644
index 6d8038e20b..0000000000
--- a/testsuites/libtests/syscall01/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-rtems_tests_PROGRAMS = syscall01
-syscall01_SOURCES = init.c
-
-dist_rtems_tests_DATA = syscall01.scn syscall01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(RTEMS_SOURCE_ROOT)/cpukit/libnetworking
-
-LINK_OBJS = $(syscall01_OBJECTS)
-LINK_LIBS = $(syscall01_LDLIBS)
-
-syscall01$(EXEEXT): $(syscall01_OBJECTS) $(syscall01_DEPENDENCIES)
-	@rm -f syscall01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/tar01/Makefile.am b/testsuites/libtests/tar01/Makefile.am
deleted file mode 100644
index 0a97f20cfb..0000000000
--- a/testsuites/libtests/tar01/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-if TARTESTS
-rtems_tests_PROGRAMS = tar01
-tar01_SOURCES =
-tar01_SOURCES += init.c
-tar01_SOURCES += ../../psxtests/psxfile01/test_cat.c
-tar01_SOURCES += initial_filesystem_tar.c
-tar01_SOURCES += initial_filesystem_tar.h
-tar01_SOURCES += initial_filesystem_tar_gz.c
-tar01_SOURCES += initial_filesystem_tar_gz.h
-
-tar01_LDADD = -lrtemscpu -lz
-
-BUILT_SOURCES =
-BUILT_SOURCES += initial_filesystem_tar.c
-BUILT_SOURCES += initial_filesystem_tar.h
-BUILT_SOURCES += initial_filesystem_tar_gz.c
-BUILT_SOURCES += initial_filesystem_tar_gz.h
-
-if TARTEST_XZ
-tar01_SOURCES += initial_filesystem_tar_xz.c
-tar01_SOURCES += initial_filesystem_tar_xz.h
-
-BUILT_SOURCES += initial_filesystem_tar_xz.c
-BUILT_SOURCES += initial_filesystem_tar_xz.h
-endif TARTEST_XZ
-
-dist_rtems_tests_DATA = tar01.scn
-dist_rtems_tests_DATA += tar01.doc
-endif TARTESTS
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-if TARTESTS
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-if TARTEST_XZ
-AM_CFLAGS += -DHAVE_XZ=1
-endif TARTEST_XZ
-
-LINK_OBJS = $(tar01_OBJECTS) $(tar01_LDADD)
-LINK_LIBS = $(tar01_LDLIBS)
-
-tar01$(EXEEXT): $(tar01_OBJECTS) $(tar01_DEPENDENCIES)
-	@rm -f tar01$(EXEEXT)
-	$(make-exe)
-
-if TARTEST_XZ
-init.$(OBJEXT): initial_filesystem_tar.h \
-	initial_filesystem_tar_gz.h \
-	initial_filesystem_tar_xz.h \
-	initial_filesystem_tar.c \
-	initial_filesystem_tar_gz.c \
-	initial_filesystem_tar_xz.c
-else
-init.$(OBJEXT): initial_filesystem_tar.h \
-	initial_filesystem_tar_gz.h \
-	initial_filesystem_tar.c \
-	initial_filesystem_tar_gz.c
-endif
-
-initial_filesystem_tar.c: initial_filesystem.tar
-	$(BIN2C) -C initial_filesystem.tar initial_filesystem_tar
-CLEANFILES += initial_filesystem_tar.c
-
-initial_filesystem_tar.h: initial_filesystem.tar
-	$(BIN2C) -H initial_filesystem.tar initial_filesystem_tar
-CLEANFILES += initial_filesystem_tar.h
-
-initial_filesystem_tar_gz.c: initial_filesystem.tar.gz
-	$(BIN2C) -C initial_filesystem.tar.gz initial_filesystem_tar_gz
-CLEANFILES += initial_filesystem_tar_gz.c
-
-initial_filesystem_tar_gz.h: initial_filesystem.tar.gz
-	$(BIN2C) -H initial_filesystem.tar.gz initial_filesystem_tar_gz
-CLEANFILES += initial_filesystem_tar_gz.h
-
-initial_filesystem_tar_xz.c: initial_filesystem.tar.xz
-	$(BIN2C) -C initial_filesystem.tar.xz initial_filesystem_tar_xz
-CLEANFILES += initial_filesystem_tar_xz.c
-
-initial_filesystem_tar_xz.h: initial_filesystem.tar.xz
-	$(BIN2C) -H initial_filesystem.tar.xz initial_filesystem_tar_xz
-CLEANFILES += initial_filesystem_tar_xz.h
-
-initial_filesystem.tar:
-	rm -rf initial_fs
-	$(MKDIR_P) initial_fs/home
-	(echo "This is a test of loading an RTEMS filesystem from an" ; \
-	echo "initial tar image.") >initial_fs/home/test_file
-	(echo "#! joel" ; \
-	echo "ls -las /dev") >initial_fs/home/test_script
-	chmod +x initial_fs/home/test_script
-	(cd initial_fs; \
-	$(LN_S) home/test_file symlink; \
-	$(PAX) -w -f ../initial_filesystem.tar home symlink)
-CLEANFILES += initial_filesystem.tar
-
-initial_filesystem.tar.gz: initial_filesystem.tar
-	$(GZIP) < initial_filesystem.tar > initial_filesystem.tar.gz
-CLEANFILES += initial_filesystem.tar.gz
-
-initial_filesystem.tar.xz: initial_filesystem.tar
-	$(XZ) --lzma2=dict=8192 < initial_filesystem.tar > initial_filesystem.tar.xz
-CLEANFILES += initial_filesystem.tar.xz
-
-endif TARTESTS
-
-clean-local:
-	-rm -rf initial_fs
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/tar01/init.c b/testsuites/libtests/tar01/init.c
index 73a5474940..39413f071b 100644
--- a/testsuites/libtests/tar01/init.c
+++ b/testsuites/libtests/tar01/init.c
@@ -23,10 +23,10 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "initial_filesystem_tar.h"
-#include "initial_filesystem_tar_gz.h"
+#include "tar01_tar.h"
+#include "tar01_tar_gz.h"
 #if HAVE_XZ
-#include "initial_filesystem_tar_xz.h"
+#include "tar01_tar_xz.h"
 #endif
 
 const char rtems_test_name[] = "TAR 1";
@@ -39,13 +39,13 @@ void test_untar_chunks_from_memory(void);
 void test_untar_unzip_tgz(void);
 void test_untar_unzip_txz(void);
 
-#define TARFILE_START initial_filesystem_tar
-#define TARFILE_SIZE  initial_filesystem_tar_size
-#define TARFILE_GZ_START initial_filesystem_tar_gz
-#define TARFILE_GZ_SIZE  initial_filesystem_tar_gz_size
+#define TARFILE_START    tar01_tar
+#define TARFILE_SIZE     tar01_tar_size
+#define TARFILE_GZ_START tar01_tar_gz
+#define TARFILE_GZ_SIZE  tar01_tar_gz_size
 #if HAVE_XZ
-#define TARFILE_XZ_START initial_filesystem_tar_xz
-#define TARFILE_XZ_SIZE  initial_filesystem_tar_xz_size
+#define TARFILE_XZ_START tar01_tar_xz
+#define TARFILE_XZ_SIZE  tar01_tar_xz_size
 #endif
 
 void test_cat(
diff --git a/testsuites/libtests/tar02/Makefile.am b/testsuites/libtests/tar02/Makefile.am
deleted file mode 100644
index 67a4136570..0000000000
--- a/testsuites/libtests/tar02/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-if TARTESTS
-rtems_tests_PROGRAMS = tar02
-tar02_SOURCES = init.c ../../psxtests/psxfile01/test_cat.c \
-  initial_filesystem_tar.c initial_filesystem_tar.h
-
-BUILT_SOURCES = initial_filesystem_tar.c initial_filesystem_tar.h
-
-dist_rtems_tests_DATA = tar02.scn
-dist_rtems_tests_DATA += tar02.doc
-endif
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-if TARTESTS
-AM_CPPFLAGS += -I$(top_srcdir)/include
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-AM_CPPFLAGS += -I$(top_srcdir)/../psxtests/include
-
-LINK_OBJS = $(tar02_OBJECTS)
-LINK_LIBS = $(tar02_LDLIBS)
-
-tar02$(EXEEXT): $(tar02_OBJECTS) $(tar02_DEPENDENCIES)
-	@rm -f tar02$(EXEEXT)
-	$(make-exe)
-
-init.$(OBJEXT): initial_filesystem_tar.h
-
-initial_filesystem_tar.c: initial_filesystem.tar
-	$(BIN2C) -C initial_filesystem.tar initial_filesystem_tar
-CLEANFILES += initial_filesystem_tar.c
-
-initial_filesystem_tar.h: initial_filesystem.tar
-	$(BIN2C) -H initial_filesystem.tar initial_filesystem_tar
-CLEANFILES += initial_filesystem_tar.h
-
-initial_filesystem.tar:
-	rm -rf initial_fs
-	$(MKDIR_P) initial_fs/home
-	(echo "This is a test of loading an RTEMS filesystem from an" ; \
-	echo "initial tar image.") >initial_fs/home/test_file
-	(cd initial_fs; \
-	$(LN_S) home/test_file symlink; \
-	$(PAX) -w -f ../initial_filesystem.tar home symlink)
-CLEANFILES += initial_filesystem.tar
-endif TARTESTS
-
-clean-local:
-	-rm -rf initial_fs
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/tar02/init.c b/testsuites/libtests/tar02/init.c
index 45dfa35a18..c46ea917ea 100644
--- a/testsuites/libtests/tar02/init.c
+++ b/testsuites/libtests/tar02/init.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "initial_filesystem_tar.h"
+#include "tar02_tar.h"
 
 const char rtems_test_name[] = "TAR 2";
 
@@ -32,8 +32,8 @@ const char rtems_test_name[] = "TAR 2";
 rtems_task Init(rtems_task_argument argument);
 void test_tarfs_load(void);
 
-#define TARFILE_START initial_filesystem_tar
-#define TARFILE_SIZE  initial_filesystem_tar_size
+#define TARFILE_START tar02_tar
+#define TARFILE_SIZE  tar02_tar_size
 
 static const char file[] = "/home/test_file";
 
diff --git a/testsuites/libtests/tar03/Makefile.am b/testsuites/libtests/tar03/Makefile.am
deleted file mode 100644
index 965cfbb986..0000000000
--- a/testsuites/libtests/tar03/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-rtems_tests_PROGRAMS = tar03
-tar03_SOURCES = init.c
-
-dist_rtems_tests_DATA = tar03.scn
-dist_rtems_tests_DATA += tar03.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(tar03_OBJECTS)
-LINK_LIBS = $(tar03_LDLIBS)
-
-tar03$(EXEEXT): $(tar03_OBJECTS) $(tar03_DEPENDENCIES)
-	@rm -f tar03$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/termios/Makefile.am b/testsuites/libtests/termios/Makefile.am
deleted file mode 100644
index 8a18ad2837..0000000000
--- a/testsuites/libtests/termios/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-
-rtems_tests_PROGRAMS = termios
-termios_SOURCES = init.c
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(termios_OBJECTS)
-LINK_LIBS = $(termios_LDLIBS)
-
-termios$(EXEEXT): $(termios_OBJECTS) $(termios_DEPENDENCIES)
-	@rm -f termios$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/termios01/Makefile.am b/testsuites/libtests/termios01/Makefile.am
deleted file mode 100644
index 5f51c8b4e3..0000000000
--- a/testsuites/libtests/termios01/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-rtems_tests_PROGRAMS = termios01
-termios01_SOURCES = init.c termios_testdriver.c
-termios01_SOURCES += termios_testdriver.h
-
-dist_rtems_tests_DATA = termios01.scn
-dist_rtems_tests_DATA += termios01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.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 = $(termios01_OBJECTS)
-LINK_LIBS = $(termios01_LDLIBS)
-
-termios01$(EXEEXT): $(termios01_OBJECTS) $(termios01_DEPENDENCIES)
-	@rm -f termios01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/termios02/Makefile.am b/testsuites/libtests/termios02/Makefile.am
deleted file mode 100644
index 63b0b7dda5..0000000000
--- a/testsuites/libtests/termios02/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = termios02
-termios02_SOURCES = init.c
-
-dist_rtems_tests_DATA = termios02.scn
-dist_rtems_tests_DATA += termios02.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.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 = $(termios02_OBJECTS)
-LINK_LIBS = $(termios02_LDLIBS)
-
-termios02$(EXEEXT): $(termios02_OBJECTS) $(termios02_DEPENDENCIES)
-	@rm -f termios02$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/termios03/Makefile.am b/testsuites/libtests/termios03/Makefile.am
deleted file mode 100644
index b7adcc77f5..0000000000
--- a/testsuites/libtests/termios03/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = termios03
-termios03_SOURCES = init.c termios_testdriver_polled.c
-termios03_SOURCES += termios_testdriver_polled.h
-
-dist_rtems_tests_DATA = termios03.scn
-dist_rtems_tests_DATA += termios03.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(termios03_OBJECTS)
-LINK_LIBS = $(termios03_LDLIBS)
-
-termios03$(EXEEXT): $(termios03_OBJECTS) $(termios03_DEPENDENCIES)
-	@rm -f termios03$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/termios04/Makefile.am b/testsuites/libtests/termios04/Makefile.am
deleted file mode 100644
index 8bc9ee8b2b..0000000000
--- a/testsuites/libtests/termios04/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = termios04
-termios04_SOURCES = init.c termios_testdriver_intr.c
-termios04_SOURCES += termios_testdriver_intr.h
-
-dist_rtems_tests_DATA = termios04.scn
-dist_rtems_tests_DATA += termios04.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(termios04_OBJECTS)
-LINK_LIBS = $(termios04_LDLIBS)
-
-termios04$(EXEEXT): $(termios04_OBJECTS) $(termios04_DEPENDENCIES)
-	@rm -f termios04$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/termios05/Makefile.am b/testsuites/libtests/termios05/Makefile.am
deleted file mode 100644
index dd5ab2c3e9..0000000000
--- a/testsuites/libtests/termios05/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-rtems_tests_PROGRAMS = termios05
-termios05_SOURCES = init.c ../termios04/termios_testdriver_intr.c
-
-dist_rtems_tests_DATA = termios05.scn
-dist_rtems_tests_DATA += termios05.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.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)/termios04
-AM_CPPFLAGS += -DTASK_DRIVEN
-
-LINK_OBJS = $(termios05_OBJECTS)
-LINK_LIBS = $(termios05_LDLIBS)
-
-termios05$(EXEEXT): $(termios05_OBJECTS) $(termios05_DEPENDENCIES)
-	@rm -f termios05$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/termios06/Makefile.am b/testsuites/libtests/termios06/Makefile.am
deleted file mode 100644
index 2c23177862..0000000000
--- a/testsuites/libtests/termios06/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = termios06
-termios06_SOURCES = init.c ../termios03/termios_testdriver_polled.c test_pppd.c
-
-dist_rtems_tests_DATA = termios06.scn
-dist_rtems_tests_DATA += termios06.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.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)/termios03
-
-LINK_OBJS = $(termios06_OBJECTS)
-LINK_LIBS = $(termios06_LDLIBS)
-
-termios06$(EXEEXT): $(termios06_OBJECTS) $(termios06_DEPENDENCIES)
-	@rm -f termios06$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/termios07/Makefile.am b/testsuites/libtests/termios07/Makefile.am
deleted file mode 100644
index fbaad0940a..0000000000
--- a/testsuites/libtests/termios07/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = termios07
-termios07_SOURCES = init.c ../termios04/termios_testdriver_intr.c
-
-dist_rtems_tests_DATA = termios07.scn
-dist_rtems_tests_DATA += termios07.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.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)/termios04
-
-LINK_OBJS = $(termios07_OBJECTS)
-LINK_LIBS = $(termios07_LDLIBS)
-
-termios07$(EXEEXT): $(termios07_OBJECTS) $(termios07_DEPENDENCIES)
-	@rm -f termios07$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/termios08/Makefile.am b/testsuites/libtests/termios08/Makefile.am
deleted file mode 100644
index 7f33846ffc..0000000000
--- a/testsuites/libtests/termios08/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = termios08
-termios08_SOURCES = init.c ../termios03/termios_testdriver_polled.c
-
-dist_rtems_tests_DATA = termios08.scn
-dist_rtems_tests_DATA += termios08.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.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)/termios03
-
-LINK_OBJS = $(termios08_OBJECTS)
-LINK_LIBS = $(termios08_LDLIBS)
-
-termios08$(EXEEXT): $(termios08_OBJECTS) $(termios08_DEPENDENCIES)
-	@rm -f termios08$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/termios09/Makefile.am b/testsuites/libtests/termios09/Makefile.am
deleted file mode 100644
index 18714de490..0000000000
--- a/testsuites/libtests/termios09/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = termios09
-termios09_SOURCES = init.c
-
-dist_rtems_tests_DATA = termios09.scn termios09.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(termios09_OBJECTS)
-LINK_LIBS = $(termios09_LDLIBS)
-
-termios09$(EXEEXT): $(termios09_OBJECTS) $(termios09_DEPENDENCIES)
-	@rm -f termios09$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/top/Makefile.am b/testsuites/libtests/top/Makefile.am
deleted file mode 100644
index c4aee3ae92..0000000000
--- a/testsuites/libtests/top/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = top
-top_SOURCES = init.c task1.c task2.c task3.c system.h
-
-dist_rtems_tests_DATA = top.scn
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(top_OBJECTS)
-LINK_LIBS = $(top_LDLIBS)
-
-top$(EXEEXT): $(top_OBJECTS) $(top_DEPENDENCIES)
-	@rm -f top$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/tztest/Makefile.am b/testsuites/libtests/tztest/Makefile.am
deleted file mode 100644
index de83e4d31e..0000000000
--- a/testsuites/libtests/tztest/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-
-rtems_tests_PROGRAMS = tztest
-tztest_SOURCES = init.c
-
-dist_rtems_tests_DATA = tztest.scn
-dist_rtems_tests_DATA += tztest.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(tztest_OBJECTS)
-LINK_LIBS = $(tztest_LDLIBS)
-
-tztest$(EXEEXT): $(tztest_OBJECTS) $(tztest_DEPENDENCIES)
-	@rm -f tztest$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/uid01/Makefile.am b/testsuites/libtests/uid01/Makefile.am
deleted file mode 100644
index b7b68d9b33..0000000000
--- a/testsuites/libtests/uid01/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-rtems_tests_PROGRAMS = uid01
-uid01_SOURCES = init.c serial_mouse_config.c msmouse.c\
-    ../termios04/termios_testdriver_intr.c
-
-dist_rtems_tests_DATA = uid01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.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)/termios04
-
-LINK_OBJS = $(uid01_OBJECTS)
-LINK_LIBS = $(uid01_LDLIBS)
-
-uid01$(EXEEXT): $(uid01_OBJECTS) $(uid01_DEPENDENCIES)
-	@rm -f uid01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/libtests/utf8proc01/Makefile.am b/testsuites/libtests/utf8proc01/Makefile.am
deleted file mode 100644
index 6884c072ff..0000000000
--- a/testsuites/libtests/utf8proc01/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-rtems_tests_PROGRAMS = utf8proc01
-utf8proc01_SOURCES = init.c
-
-dist_rtems_tests_DATA = utf8proc01.scn utf8proc01.doc
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/leaf.am
-
-AM_CPPFLAGS += -I$(top_srcdir)/../support/include
-
-LINK_OBJS = $(utf8proc01_OBJECTS)
-LINK_LIBS = $(utf8proc01_LDLIBS)
-
-utf8proc01$(EXEEXT): $(utf8proc01_OBJECTS) $(utf8proc01_DEPENDENCIES)
-	@rm -f utf8proc01$(EXEEXT)
-	$(make-exe)
-
-include $(top_srcdir)/../automake/local.am
-- 
cgit v1.2.3