9 files changed, 63 insertions, 72 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)