Misc. bugfixes.

47 files changed, 35 insertions, 65 deletions

diff --git a/testsuites/mptests/mp01/Makefile.am b/testsuites/mptests/mp01/Makefile.am
index f3a9c875ed..4665714c9e 100644
--- a/testsuites/mptests/mp01/Makefile.am
+++ b/testsuites/mptests/mp01/Makefile.am
@@ -4,7 +4,5 @@
 
 SUBDIRS = node1 node2
 
-EXTRA_DIST = system.h init.c task1.c
-
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am
index e2201edda8..8b4d4b40fe 100644
--- a/testsuites/mptests/mp01/node1/Makefile.am
+++ b/testsuites/mptests/mp01/node1/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am
index 2913dd9193..b1e64856ae 100644
--- a/testsuites/mptests/mp01/node2/Makefile.am
+++ b/testsuites/mptests/mp01/node2/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp02/Makefile.am b/testsuites/mptests/mp02/Makefile.am
index f3a9c875ed..4665714c9e 100644
--- a/testsuites/mptests/mp02/Makefile.am
+++ b/testsuites/mptests/mp02/Makefile.am
@@ -4,7 +4,5 @@
 
 SUBDIRS = node1 node2
 
-EXTRA_DIST = system.h init.c task1.c
-
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am
index 7d9f3a2c80..4a4955bbbe 100644
--- a/testsuites/mptests/mp02/node1/Makefile.am
+++ b/testsuites/mptests/mp02/node1/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am
index b7cd66725b..7cb2a07217 100644
--- a/testsuites/mptests/mp02/node2/Makefile.am
+++ b/testsuites/mptests/mp02/node2/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp03/Makefile.am b/testsuites/mptests/mp03/Makefile.am
index cffab5fade..4665714c9e 100644
--- a/testsuites/mptests/mp03/Makefile.am
+++ b/testsuites/mptests/mp03/Makefile.am
@@ -4,7 +4,5 @@
 
 SUBDIRS = node1 node2
 
-EXTRA_DIST = system.h delay.c init.c task1.c
-
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am
index 447be529e9..8174e2ed28 100644
--- a/testsuites/mptests/mp03/node1/Makefile.am
+++ b/testsuites/mptests/mp03/node1/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp timer event
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../delay.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../delay.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am
index 3116194fa9..578d99721c 100644
--- a/testsuites/mptests/mp03/node2/Makefile.am
+++ b/testsuites/mptests/mp03/node2/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp timer event
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../delay.c ../task1.c system.h
+lib_a_SOURCES = ../init.c ../delay.c ../task1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp04/Makefile.am b/testsuites/mptests/mp04/Makefile.am
index f3a9c875ed..4665714c9e 100644
--- a/testsuites/mptests/mp04/Makefile.am
+++ b/testsuites/mptests/mp04/Makefile.am
@@ -4,7 +4,5 @@
 
 SUBDIRS = node1 node2
 
-EXTRA_DIST = system.h init.c task1.c
-
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am
index 9be5410016..cab074a922 100644
--- a/testsuites/mptests/mp04/node1/Makefile.am
+++ b/testsuites/mptests/mp04/node1/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am
index af77400f68..7af3d60075 100644
--- a/testsuites/mptests/mp04/node2/Makefile.am
+++ b/testsuites/mptests/mp04/node2/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp05/Makefile.am b/testsuites/mptests/mp05/Makefile.am
index 7a94bdc610..4665714c9e 100644
--- a/testsuites/mptests/mp05/Makefile.am
+++ b/testsuites/mptests/mp05/Makefile.am
@@ -4,7 +4,5 @@
 
 SUBDIRS = node1 node2
 
-EXTRA_DIST = system.h asr.c init.c task1.c
-
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am
index 78eec2f55e..b73dd890f9 100644
--- a/testsuites/mptests/mp05/node1/Makefile.am
+++ b/testsuites/mptests/mp05/node1/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp signal timer
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../asr.c ../task1.c system.h
+lib_a_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am
index 59de3880ff..4779bdba26 100644
--- a/testsuites/mptests/mp05/node2/Makefile.am
+++ b/testsuites/mptests/mp05/node2/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp signal timer
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../asr.c ../task1.c system.h
+lib_a_SOURCES = ../init.c ../asr.c ../task1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp06/Makefile.am b/testsuites/mptests/mp06/Makefile.am
index f3a9c875ed..4665714c9e 100644
--- a/testsuites/mptests/mp06/Makefile.am
+++ b/testsuites/mptests/mp06/Makefile.am
@@ -4,7 +4,5 @@
 
 SUBDIRS = node1 node2
 
-EXTRA_DIST = system.h init.c task1.c
-
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am
index b939457c24..69dfb4c3be 100644
--- a/testsuites/mptests/mp06/node1/Makefile.am
+++ b/testsuites/mptests/mp06/node1/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am
index d13a23e15d..d6108e94f4 100644
--- a/testsuites/mptests/mp06/node2/Makefile.am
+++ b/testsuites/mptests/mp06/node2/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp07/Makefile.am b/testsuites/mptests/mp07/Makefile.am
index f3a9c875ed..4665714c9e 100644
--- a/testsuites/mptests/mp07/Makefile.am
+++ b/testsuites/mptests/mp07/Makefile.am
@@ -4,7 +4,5 @@
 
 SUBDIRS = node1 node2
 
-EXTRA_DIST = system.h init.c task1.c
-
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am
index e5d70e85cb..fdb263947b 100644
--- a/testsuites/mptests/mp07/node1/Makefile.am
+++ b/testsuites/mptests/mp07/node1/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am
index f5b73b6314..24ed5857c2 100644
--- a/testsuites/mptests/mp07/node2/Makefile.am
+++ b/testsuites/mptests/mp07/node2/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp event timer
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp08/Makefile.am b/testsuites/mptests/mp08/Makefile.am
index f3a9c875ed..4665714c9e 100644
--- a/testsuites/mptests/mp08/Makefile.am
+++ b/testsuites/mptests/mp08/Makefile.am
@@ -4,7 +4,5 @@
 
 SUBDIRS = node1 node2
 
-EXTRA_DIST = system.h init.c task1.c
-
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am
index 11bf3fedeb..88a0b75366 100644
--- a/testsuites/mptests/mp08/node1/Makefile.am
+++ b/testsuites/mptests/mp08/node1/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp semaphore
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am
index 20d2307a64..5b05d88efd 100644
--- a/testsuites/mptests/mp08/node2/Makefile.am
+++ b/testsuites/mptests/mp08/node2/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp semaphore
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp09/Makefile.am b/testsuites/mptests/mp09/Makefile.am
index 964e7a7b69..4665714c9e 100644
--- a/testsuites/mptests/mp09/Makefile.am
+++ b/testsuites/mptests/mp09/Makefile.am
@@ -4,7 +4,5 @@
 
 SUBDIRS = node1 node2
 
-EXTRA_DIST = system.h init.c recvmsg.c sendmsg.c task1.c
-
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am
index ea81b9302b..092c58ac72 100644
--- a/testsuites/mptests/mp09/node1/Makefile.am
+++ b/testsuites/mptests/mp09/node1/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp message
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am
index 13075bdcfd..ae0516a8a5 100644
--- a/testsuites/mptests/mp09/node2/Makefile.am
+++ b/testsuites/mptests/mp09/node2/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp message
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp10/Makefile.am b/testsuites/mptests/mp10/Makefile.am
index c587399d80..4665714c9e 100644
--- a/testsuites/mptests/mp10/Makefile.am
+++ b/testsuites/mptests/mp10/Makefile.am
@@ -4,7 +4,5 @@
 
 SUBDIRS = node1 node2
 
-EXTRA_DIST = system.h init.c task1.c task2.c task3.c
-
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am
index acf58bf8ab..f4f3effba7 100644
--- a/testsuites/mptests/mp10/node1/Makefile.am
+++ b/testsuites/mptests/mp10/node1/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am
index 6c2d0df2b6..175d2e9874 100644
--- a/testsuites/mptests/mp10/node2/Makefile.am
+++ b/testsuites/mptests/mp10/node2/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp11/Makefile.am b/testsuites/mptests/mp11/Makefile.am
index 1d367f03d8..4665714c9e 100644
--- a/testsuites/mptests/mp11/Makefile.am
+++ b/testsuites/mptests/mp11/Makefile.am
@@ -4,7 +4,5 @@
 
 SUBDIRS = node1 node2
 
-EXTRA_DIST = system.h init.c
-
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am
index 72c72d6696..e33879e1cf 100644
--- a/testsuites/mptests/mp11/node1/Makefile.am
+++ b/testsuites/mptests/mp11/node1/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp message partition semaphore
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c system.h
+lib_a_SOURCES = ../init.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am
index 72d92b21ba..b535460d83 100644
--- a/testsuites/mptests/mp11/node2/Makefile.am
+++ b/testsuites/mptests/mp11/node2/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp message partition semaphore
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c system.h
+lib_a_SOURCES = ../init.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp12/Makefile.am b/testsuites/mptests/mp12/Makefile.am
index 1d367f03d8..4665714c9e 100644
--- a/testsuites/mptests/mp12/Makefile.am
+++ b/testsuites/mptests/mp12/Makefile.am
@@ -4,7 +4,5 @@
 
 SUBDIRS = node1 node2
 
-EXTRA_DIST = system.h init.c
-
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am
index 0501ccbcf1..91b261ae48 100644
--- a/testsuites/mptests/mp12/node1/Makefile.am
+++ b/testsuites/mptests/mp12/node1/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp partition
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c system.h
+lib_a_SOURCES = ../init.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am
index 102f20cb9c..2d1a09f5f8 100644
--- a/testsuites/mptests/mp12/node2/Makefile.am
+++ b/testsuites/mptests/mp12/node2/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp partition
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c system.h
+lib_a_SOURCES = ../init.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp13/Makefile.am b/testsuites/mptests/mp13/Makefile.am
index be7bc2a22e..4665714c9e 100644
--- a/testsuites/mptests/mp13/Makefile.am
+++ b/testsuites/mptests/mp13/Makefile.am
@@ -4,7 +4,5 @@
 
 SUBDIRS = node1 node2
 
-EXTRA_DIST = system.h init.c task1.c task2.c
-
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am
index ea269eb5fe..2bea70ef01 100644
--- a/testsuites/mptests/mp13/node1/Makefile.am
+++ b/testsuites/mptests/mp13/node1/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../task2.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am
index acf62dc3ec..2c222d7573 100644
--- a/testsuites/mptests/mp13/node2/Makefile.am
+++ b/testsuites/mptests/mp13/node2/Makefile.am
@@ -9,7 +9,7 @@ PGM = ${ARCH}/$(TEST)-node$(NODE).exe
 MANAGERS = io mp message semaphore
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../task1.c ../task2.c system.h
+lib_a_SOURCES = ../init.c ../task1.c ../task2.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp14/Makefile.am b/testsuites/mptests/mp14/Makefile.am
index b10af84f50..4665714c9e 100644
--- a/testsuites/mptests/mp14/Makefile.am
+++ b/testsuites/mptests/mp14/Makefile.am
@@ -4,8 +4,5 @@
 
 SUBDIRS = node1 node2
 
-EXTRA_DIST = system.h delay.c evtask1.c evtmtask.c exit.c init.c msgtask1.c \
-    pttask1.c smtask1.c
-
 include $(top_srcdir)/../automake/subdirs.am
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am
index 980c57348e..fdbc28b9e5 100644
--- a/testsuites/mptests/mp14/node1/Makefile.am
+++ b/testsuites/mptests/mp14/node1/Makefile.am
@@ -10,7 +10,7 @@ MANAGERS = io mp event partition semaphore timer message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
-    ../pttask1.c ../smtask1.c ../msgtask1.c system.h
+    ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am
index f6774b869f..44187d1e8e 100644
--- a/testsuites/mptests/mp14/node2/Makefile.am
+++ b/testsuites/mptests/mp14/node2/Makefile.am
@@ -10,7 +10,7 @@ MANAGERS = io mp event partition semaphore timer message
 
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
-    ../pttask1.c ../smtask1.c ../msgtask1.c system.h
+    ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
diff --git a/testsuites/sptests/sp27/Makefile.am b/testsuites/sptests/sp27/Makefile.am
index 585496b97f..3d40ae8ca9 100644
--- a/testsuites/sptests/sp27/Makefile.am
+++ b/testsuites/sptests/sp27/Makefile.am
@@ -9,7 +9,7 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCTYPES = scn
+DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
 OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp28/Makefile.am b/testsuites/sptests/sp28/Makefile.am
index 919895fd37..c417534f27 100644
--- a/testsuites/sptests/sp28/Makefile.am
+++ b/testsuites/sptests/sp28/Makefile.am
@@ -9,7 +9,7 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCTYPES = scn
+DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
 OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp29/Makefile.am b/testsuites/sptests/sp29/Makefile.am
index 13f1f8ece7..36d1d19517 100644
--- a/testsuites/sptests/sp29/Makefile.am
+++ b/testsuites/sptests/sp29/Makefile.am
@@ -9,7 +9,7 @@ MANAGERS = all
 noinst_LIBRARIES = lib.a
 lib_a_SOURCES = init.c
 
-DOCTYPES = scn
+DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
 OBJS = $(lib_a_OBJECTS)
diff --git a/testsuites/sptests/sp30/Makefile.am b/testsuites/sptests/sp30/Makefile.am
index d71eb797fb..7cfa1aa66b 100644
--- a/testsuites/sptests/sp30/Makefile.am
+++ b/testsuites/sptests/sp30/Makefile.am
@@ -7,14 +7,13 @@ TEST = sp30
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c resume.c task1.c
+lib_a_SOURCES = init.c resume.c task1.c system.h
 
-DOCTYPES = scn
+DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
 OBJS = $(lib_a_OBJECTS)
 
-
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
diff --git a/testsuites/sptests/sp31/Makefile.am b/testsuites/sptests/sp31/Makefile.am
index 0eac3c45b5..9305f3a672 100644
--- a/testsuites/sptests/sp31/Makefile.am
+++ b/testsuites/sptests/sp31/Makefile.am
@@ -7,9 +7,9 @@ TEST = sp31
 MANAGERS = all
 
 noinst_LIBRARIES = lib.a
-lib_a_SOURCES = delay.c init.c prtime.c task1.c
+lib_a_SOURCES = delay.c init.c prtime.c task1.c system.h
 
-DOCTYPES = scn
+DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
 OBJS = $(lib_a_OBJECTS)