Partial conversion to automake.

41 files changed, 258 insertions, 344 deletions

diff --git a/testsuites/itrontests/itronhello/Makefile.am b/testsuites/itrontests/itronhello/Makefile.am
index 7965724e92..255fe6bb6c 100644
--- a/testsuites/itrontests/itronhello/Makefile.am
+++ b/testsuites/itrontests/itronhello/Makefile.am
@@ -7,22 +7,21 @@ PGM = ${ARCH}/$(TEST).exe
 
 MANAGERS = all
 
-C_FILES = init.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c
 
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+lib_a_SOURCES += system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(DOCS) $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS = $(DOCS)
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/itrontests.am
 
@@ -35,7 +34,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/itrontests/itronmbf01/Makefile.am b/testsuites/itrontests/itronmbf01/Makefile.am
index dea51f18bd..e84bc41e45 100644
--- a/testsuites/itrontests/itronmbf01/Makefile.am
+++ b/testsuites/itrontests/itronmbf01/Makefile.am
@@ -7,22 +7,21 @@ PGM = ${ARCH}/$(TEST).exe
 
 MANAGERS = all
 
-C_FILES = init.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c
 
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+lib_a_SOURCES += system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(DOCS) $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS = $(DOCS)
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/itrontests.am
 
@@ -35,7 +34,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/itrontests/itronmbox01/Makefile.am b/testsuites/itrontests/itronmbox01/Makefile.am
index 3912b4bc75..a7c63b590a 100644
--- a/testsuites/itrontests/itronmbox01/Makefile.am
+++ b/testsuites/itrontests/itronmbox01/Makefile.am
@@ -7,22 +7,21 @@ PGM = ${ARCH}/$(TEST).exe
 
 MANAGERS = all
 
-C_FILES = init.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c
 
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+lib_a_SOURCES += system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(DOCS) $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS = $(DOCS)
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/itrontests.am
 
@@ -35,7 +34,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/itrontests/itronsem01/Makefile.am b/testsuites/itrontests/itronsem01/Makefile.am
index 195c559c58..8d8af68291 100644
--- a/testsuites/itrontests/itronsem01/Makefile.am
+++ b/testsuites/itrontests/itronsem01/Makefile.am
@@ -7,22 +7,21 @@ PGM = ${ARCH}/$(TEST).exe
 
 MANAGERS = all
 
-C_FILES = init.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c
 
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+lib_a_SOURCES += system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(DOCS) $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS = $(DOCS)
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/itrontests.am
 
@@ -35,7 +34,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/itrontests/itrontask01/Makefile.am b/testsuites/itrontests/itrontask01/Makefile.am
index 9d4289943e..b95d3592cd 100644
--- a/testsuites/itrontests/itrontask01/Makefile.am
+++ b/testsuites/itrontests/itrontask01/Makefile.am
@@ -7,22 +7,21 @@ PGM = ${ARCH}/$(TEST).exe
 
 MANAGERS = all
 
-C_FILES = init.c task1.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c
 
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+lib_a_SOURCES += system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(DOCS) $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS = $(DOCS)
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/itrontests.am
 
@@ -35,7 +34,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/itrontests/itrontask02/Makefile.am b/testsuites/itrontests/itrontask02/Makefile.am
index 2ce2a32785..5ea4f80b64 100644
--- a/testsuites/itrontests/itrontask02/Makefile.am
+++ b/testsuites/itrontests/itrontask02/Makefile.am
@@ -7,22 +7,21 @@ PGM = ${ARCH}/$(TEST).exe
 
 MANAGERS = all
 
-C_FILES = init.c dormant.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c dormant.c
 
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+lib_a_SOURCES += system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(DOCS) $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS = $(DOCS)
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/itrontests.am
 
@@ -35,7 +34,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/itrontests/itrontask03/Makefile.am b/testsuites/itrontests/itrontask03/Makefile.am
index 1fa381da4d..3718ba505d 100644
--- a/testsuites/itrontests/itrontask03/Makefile.am
+++ b/testsuites/itrontests/itrontask03/Makefile.am
@@ -7,22 +7,21 @@ PGM = ${ARCH}/$(TEST).exe
 
 MANAGERS = all
 
-C_FILES = init.c preempt.c task1.c task2.c task3.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c preempt.c task1.c task2.c task3.c
 
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+lib_a_SOURCES += system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(DOCS) $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS = $(DOCS)
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/itrontests.am
 
@@ -35,7 +34,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/itrontests/itrontask04/Makefile.am b/testsuites/itrontests/itrontask04/Makefile.am
index ea9532ad27..0e9cfea100 100644
--- a/testsuites/itrontests/itrontask04/Makefile.am
+++ b/testsuites/itrontests/itrontask04/Makefile.am
@@ -7,22 +7,21 @@ PGM = ${ARCH}/$(TEST).exe
 
 MANAGERS = all
 
-C_FILES = init.c task1.c task2.c task3.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c task2.c task3.c
 
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+lib_a_SOURCES += system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(DOCS) $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS = $(DOCS)
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/itrontests.am
 
@@ -35,7 +34,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/itrontests/itrontime01/Makefile.am b/testsuites/itrontests/itrontime01/Makefile.am
index 12d75247b9..ca8033384c 100644
--- a/testsuites/itrontests/itrontime01/Makefile.am
+++ b/testsuites/itrontests/itrontime01/Makefile.am
@@ -7,22 +7,21 @@ PGM = ${ARCH}/$(TEST).exe
 
 MANAGERS = all
 
-C_FILES = init.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c
 
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+lib_a_SOURCES += system.h
 
 DOCTYPES = doc scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(DOCS) $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS = $(DOCS)
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/itrontests.am
 
@@ -35,7 +34,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp01/Makefile.am b/testsuites/sptests/sp01/Makefile.am
index ddff5ef4eb..6e60db0c14 100644
--- a/testsuites/sptests/sp01/Makefile.am
+++ b/testsuites/sptests/sp01/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp01
 
 MANAGERS = io
 
-C_FILES = init.c task1.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp02/Makefile.am b/testsuites/sptests/sp02/Makefile.am
index ffb6500bb0..23153d49a2 100644
--- a/testsuites/sptests/sp02/Makefile.am
+++ b/testsuites/sptests/sp02/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp02
 
 MANAGERS = io
 
-C_FILES = init.c task1.c task2.c task3.c preempt.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c task2.c task3.c preempt.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp03/Makefile.am b/testsuites/sptests/sp03/Makefile.am
index 31ec395919..d19162a151 100644
--- a/testsuites/sptests/sp03/Makefile.am
+++ b/testsuites/sptests/sp03/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp03
 
 MANAGERS = io
 
-C_FILES = init.c task1.c task2.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c task2.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp04/Makefile.am b/testsuites/sptests/sp04/Makefile.am
index 7b3c66c4b1..8be7d3b0a8 100644
--- a/testsuites/sptests/sp04/Makefile.am
+++ b/testsuites/sptests/sp04/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp04
 
 MANAGERS = io
 
-C_FILES = init.c task1.c task2.c task3.c tswitch.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c task2.c task3.c tswitch.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp05/Makefile.am b/testsuites/sptests/sp05/Makefile.am
index b4c8430cd0..bb0ef1c4d2 100644
--- a/testsuites/sptests/sp05/Makefile.am
+++ b/testsuites/sptests/sp05/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp05
 
 MANAGERS = io
 
-C_FILES = init.c task1.c task2.c task3.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp06/Makefile.am b/testsuites/sptests/sp06/Makefile.am
index e14a0e2b1b..5a3d85b76c 100644
--- a/testsuites/sptests/sp06/Makefile.am
+++ b/testsuites/sptests/sp06/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp06
 
 MANAGERS = io
 
-C_FILES = init.c task1.c task2.c task3.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp07/Makefile.am b/testsuites/sptests/sp07/Makefile.am
index 5c363e5016..a4485d7cf1 100644
--- a/testsuites/sptests/sp07/Makefile.am
+++ b/testsuites/sptests/sp07/Makefile.am
@@ -6,25 +6,22 @@ TEST = sp07
 
 MANAGERS = io
 
-C_FILES = init.c buffered_io.c task1.c task2.c task3.c task4.c taskexit.c \
-    tcreate.c tdelete.c trestart.c tstart.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c buffered_io.c task1.c task2.c task3.c task4.c taskexit.c \
+    tcreate.c tdelete.c trestart.c tstart.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -33,7 +30,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp08/Makefile.am b/testsuites/sptests/sp08/Makefile.am
index 7598a4e643..013261f1e4 100644
--- a/testsuites/sptests/sp08/Makefile.am
+++ b/testsuites/sptests/sp08/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp08
 
 MANAGERS = io
 
-C_FILES = init.c task1.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp09/Makefile.am b/testsuites/sptests/sp09/Makefile.am
index 1ce78b5147..b77a3cdd69 100644
--- a/testsuites/sptests/sp09/Makefile.am
+++ b/testsuites/sptests/sp09/Makefile.am
@@ -7,27 +7,24 @@ TEST = sp09
 MANAGERS = io message dual_ported_memory event multi_processor region \
     semaphore signal rate_monotonic timer partition
 
-C_FILES = init.c delay.c isr.c screen01.c screen02.c screen03.c screen04.c \
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c delay.c isr.c screen01.c screen02.c screen03.c screen04.c \
     screen05.c screen06.c screen07.c screen08.c screen09.c screen10.c \
     screen11.c screen12.c screen13.c screen14.c task1.c task2.c task3.c \
-    task4.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+    task4.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -36,7 +33,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp11/Makefile.am b/testsuites/sptests/sp11/Makefile.am
index 6bebe804b1..4e2c87d13c 100644
--- a/testsuites/sptests/sp11/Makefile.am
+++ b/testsuites/sptests/sp11/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp11
 
 MANAGERS = io event timer
 
-C_FILES = init.c task1.c task2.c timer.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c task2.c timer.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp12/Makefile.am b/testsuites/sptests/sp12/Makefile.am
index 2acd1c6f5a..19006c4f2e 100644
--- a/testsuites/sptests/sp12/Makefile.am
+++ b/testsuites/sptests/sp12/Makefile.am
@@ -6,24 +6,22 @@ TEST = sp12
 
 MANAGERS = io semaphore
 
-C_FILES = init.c task1.c task2.c task3.c task4.c task5.c pridrv.c pritask.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c pridrv.c \
+    pritask.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +30,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp13/Makefile.am b/testsuites/sptests/sp13/Makefile.am
index fc920edf77..dbfeee34f2 100644
--- a/testsuites/sptests/sp13/Makefile.am
+++ b/testsuites/sptests/sp13/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp13
 
 MANAGERS = io message
 
-C_FILES = init.c fillbuff.c putbuff.c task1.c task2.c task3.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c fillbuff.c putbuff.c task1.c task2.c task3.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp14/Makefile.am b/testsuites/sptests/sp14/Makefile.am
index 4ec42079b7..49f08ebb2f 100644
--- a/testsuites/sptests/sp14/Makefile.am
+++ b/testsuites/sptests/sp14/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp14
 
 MANAGERS = io signal timer
 
-C_FILES = init.c asr.c task1.c task2.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c asr.c task1.c task2.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp15/Makefile.am b/testsuites/sptests/sp15/Makefile.am
index f2ed6f030f..da88dfa73a 100644
--- a/testsuites/sptests/sp15/Makefile.am
+++ b/testsuites/sptests/sp15/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp15
 
 MANAGERS = io partition
 
-C_FILES = init.c task1.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp16/Makefile.am b/testsuites/sptests/sp16/Makefile.am
index 426bbefc8e..6a28a3bffe 100644
--- a/testsuites/sptests/sp16/Makefile.am
+++ b/testsuites/sptests/sp16/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp16
 
 MANAGERS = io region
 
-C_FILES = init.c task1.c task2.c task3.c task4.c task5.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c task2.c task3.c task4.c task5.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp17/Makefile.am b/testsuites/sptests/sp17/Makefile.am
index c0520187a6..1954889564 100644
--- a/testsuites/sptests/sp17/Makefile.am
+++ b/testsuites/sptests/sp17/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp17
 
 MANAGERS = io signal
 
-C_FILES = init.c asr.c task1.c task2.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c asr.c task1.c task2.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp19/Makefile.am b/testsuites/sptests/sp19/Makefile.am
index 28d93e2133..38fcc88f99 100644
--- a/testsuites/sptests/sp19/Makefile.am
+++ b/testsuites/sptests/sp19/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp19
 
 MANAGERS = io
 
-C_FILES = init.c first.c fptask.c task1.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h fptest.h inttest.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c first.c fptask.c task1.c system.h fptest.h inttest.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp20/Makefile.am b/testsuites/sptests/sp20/Makefile.am
index 4646dcb545..26d1c56fce 100644
--- a/testsuites/sptests/sp20/Makefile.am
+++ b/testsuites/sptests/sp20/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp20
 
 MANAGERS = io rate_monotonic
 
-C_FILES = init.c getall.c task1.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c getall.c task1.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp21/Makefile.am b/testsuites/sptests/sp21/Makefile.am
index 2130f728b3..878e54071c 100644
--- a/testsuites/sptests/sp21/Makefile.am
+++ b/testsuites/sptests/sp21/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp21
 
 MANAGERS = io
 
-C_FILES = init.c task1.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp22/Makefile.am b/testsuites/sptests/sp22/Makefile.am
index 164c80dd20..d92760d764 100644
--- a/testsuites/sptests/sp22/Makefile.am
+++ b/testsuites/sptests/sp22/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp22
 
 MANAGERS = io timer
 
-C_FILES = init.c prtime.c delay.c task1.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c prtime.c delay.c task1.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp23/Makefile.am b/testsuites/sptests/sp23/Makefile.am
index f18d810dde..8c7d19da24 100644
--- a/testsuites/sptests/sp23/Makefile.am
+++ b/testsuites/sptests/sp23/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp23
 
 MANAGERS = io dual_ported_memory
 
-C_FILES = init.c task1.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp24/Makefile.am b/testsuites/sptests/sp24/Makefile.am
index db2725758b..5db6232cfe 100644
--- a/testsuites/sptests/sp24/Makefile.am
+++ b/testsuites/sptests/sp24/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp24
 
 MANAGERS = io event timer
 
-C_FILES = init.c resume.c task1.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c resume.c task1.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp25/Makefile.am b/testsuites/sptests/sp25/Makefile.am
index ea451e600f..5b44202dae 100644
--- a/testsuites/sptests/sp25/Makefile.am
+++ b/testsuites/sptests/sp25/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp25
 
 MANAGERS = io region
 
-C_FILES = init.c task1.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp26/Makefile.am b/testsuites/sptests/sp26/Makefile.am
index 92d340cb92..cf24fa1179 100644
--- a/testsuites/sptests/sp26/Makefile.am
+++ b/testsuites/sptests/sp26/Makefile.am
@@ -6,24 +6,21 @@ TEST = sp26
 
 MANAGERS = io region event
 
-C_FILES = init.c task1.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c task1.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp27/Makefile.am b/testsuites/sptests/sp27/Makefile.am
index b8a175eb10..17e99f33c1 100644
--- a/testsuites/sptests/sp27/Makefile.am
+++ b/testsuites/sptests/sp27/Makefile.am
@@ -6,21 +6,21 @@ TEST = sp27
 
 MANAGERS = all
 
-C_FILES = init.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c
 
 DOCTYPES = scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -29,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp28/Makefile.am b/testsuites/sptests/sp28/Makefile.am
index d6bda5ac97..059acbee21 100644
--- a/testsuites/sptests/sp28/Makefile.am
+++ b/testsuites/sptests/sp28/Makefile.am
@@ -6,21 +6,21 @@ TEST = sp28
 
 MANAGERS = all
 
-C_FILES = init.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c
 
 DOCTYPES = scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -29,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp29/Makefile.am b/testsuites/sptests/sp29/Makefile.am
index 8488c4b258..fc56c7e768 100644
--- a/testsuites/sptests/sp29/Makefile.am
+++ b/testsuites/sptests/sp29/Makefile.am
@@ -6,21 +6,21 @@ TEST = sp29
 
 MANAGERS = all
 
-C_FILES = init.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c
 
 DOCTYPES = scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -29,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp30/Makefile.am b/testsuites/sptests/sp30/Makefile.am
index 97493c92e0..aeeb7fb81a 100644
--- a/testsuites/sptests/sp30/Makefile.am
+++ b/testsuites/sptests/sp30/Makefile.am
@@ -6,21 +6,21 @@ TEST = sp30
 
 MANAGERS = all
 
-C_FILES = init.c resume.c task1.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c resume.c task1.c
 
 DOCTYPES = scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -29,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp31/Makefile.am b/testsuites/sptests/sp31/Makefile.am
index 20deea2595..29cb52b04b 100644
--- a/testsuites/sptests/sp31/Makefile.am
+++ b/testsuites/sptests/sp31/Makefile.am
@@ -6,21 +6,21 @@ TEST = sp31
 
 MANAGERS = all
 
-C_FILES = delay.c init.c prtime.c task1.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = delay.c init.c prtime.c task1.c
 
 DOCTYPES = scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -29,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/sp32/Makefile.am b/testsuites/sptests/sp32/Makefile.am
index 75e979990f..fe0df1f1c5 100644
--- a/testsuites/sptests/sp32/Makefile.am
+++ b/testsuites/sptests/sp32/Makefile.am
@@ -6,21 +6,21 @@ TEST = sp32
 
 MANAGERS = io rate_monotonic
 
-C_FILES = init.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c
 
 DOCTYPES = scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -29,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/spfatal/Makefile.am b/testsuites/sptests/spfatal/Makefile.am
index 2b993bdfde..61de226e69 100644
--- a/testsuites/sptests/spfatal/Makefile.am
+++ b/testsuites/sptests/spfatal/Makefile.am
@@ -6,24 +6,21 @@ TEST = spfatal
 
 MANAGERS = io
 
-C_FILES = init.c puterr.c fatal.c task1.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c puterr.c fatal.c task1.c system.h
 
 DOCTYPES = scn doc
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PRINT_SRCS = $(DOCS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -32,7 +29,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)
 
diff --git a/testsuites/sptests/spsize/Makefile.am b/testsuites/sptests/spsize/Makefile.am
index 8ede1d9867..44a4ae141b 100644
--- a/testsuites/sptests/spsize/Makefile.am
+++ b/testsuites/sptests/spsize/Makefile.am
@@ -6,22 +6,19 @@ TEST = size
 
 MANAGERS = io
 
-C_FILES = init.c getint.c size.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT))
-
-H_FILES = system.h
-noinst_HEADERS = $(H_FILES)
+noinst_LIBRARIES = lib.a
+lib_a_SOURCES = init.c getint.c size.c system.h
 
 DOCTYPES = scn
 DOCS = $(DOCTYPES:%=$(TEST).%)
 
-SRCS = $(C_FILES) $(H_FILES)
-OBJS = $(C_O_FILES)
+SRCS =
+OBJS = $(lib_a_OBJECTS)
 
 PGM = ${ARCH}/$(TEST).exe
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../automake/compile.am
+include $(top_srcdir)/../automake/amcompile.am
 include $(top_srcdir)/../automake/leaf.am
 include $(top_srcdir)/sptests.am
 
@@ -30,7 +27,7 @@ ${PGM}: $(OBJS) $(LINK_FILES)
 
 all-local: $(TMPINSTALL_FILES)
 
-EXTRA_DIST = $(C_FILES) $(DOCS)
+EXTRA_DIST = $(DOCS)
 
 CLEANFILES = $(TMPINSTALL_FILES)