Convert to using *_PROGRAMS.

9 files changed, 81 insertions, 108 deletions

diff --git a/testsuites/itrontests/itronhello/Makefile.am b/testsuites/itrontests/itronhello/Makefile.am
index f00d66ebe5..45d5aa61ad 100644
--- a/testsuites/itrontests/itronhello/Makefile.am
+++ b/testsuites/itrontests/itronhello/Makefile.am
@@ -2,32 +2,29 @@
 ## $Id$
 ##
 
-PGM = ${ARCH}/itronhello.exe
-
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = itronhello.exe
+itronhello_exe_SOURCES = init.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = itronhello.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = itronhello.doc
 
-OBJS = $(lib_a_OBJECTS)
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+itronhello_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itronhello_exe_OBJECTS) $(itronhello_exe_LDADD)
+LINK_LIBS = $(itronhello_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+itronhello.exe$(EXEEXT): $(itronhello_exe_OBJECTS) $(itronhello_exe_DEPENDENCIES)
+	@rm -f itronhello.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itronmbf01/Makefile.am b/testsuites/itrontests/itronmbf01/Makefile.am
index df8f999bd5..b224171abf 100644
--- a/testsuites/itrontests/itronmbf01/Makefile.am
+++ b/testsuites/itrontests/itronmbf01/Makefile.am
@@ -2,32 +2,29 @@
 ## $Id$
 ##
 
-PGM = ${ARCH}/itronmbf01.exe
-
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = itronmbf01.exe
+itronmbf01_exe_SOURCES = init.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = itronmbf01.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = itronmbf01.doc
 
-OBJS = $(lib_a_OBJECTS)
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+itronmbf01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itronmbf01_exe_OBJECTS) $(itronmbf01_exe_LDADD)
+LINK_LIBS = $(itronmbf01_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+itronmbf01.exe$(EXEEXT): $(itronmbf01_exe_OBJECTS) $(itronmbf01_exe_DEPENDENCIES)
+	@rm -f itronmbf01.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itronmbox01/Makefile.am b/testsuites/itrontests/itronmbox01/Makefile.am
index 4e18e54046..75c7c35820 100644
--- a/testsuites/itrontests/itronmbox01/Makefile.am
+++ b/testsuites/itrontests/itronmbox01/Makefile.am
@@ -2,32 +2,29 @@
 ## $Id$
 ##
 
-PGM = ${ARCH}/itronmbox01.exe
-
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = itronmbox01.exe
+itronmbox01_exe_SOURCES = init.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = itronmbox01.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = itronmbox01.doc
 
-OBJS = $(lib_a_OBJECTS)
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+itronmbox01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itronmbox01_exe_OBJECTS) $(itronmbox01_exe_LDADD)
+LINK_LIBS = $(itronmbox01_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+itronmbox01.exe$(EXEEXT): $(itronmbox01_exe_OBJECTS) $(itronmbox01_exe_DEPENDENCIES)
+	@rm -f itronmbox01.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itronsem01/Makefile.am b/testsuites/itrontests/itronsem01/Makefile.am
index 21449bbdb2..de66f5b46e 100644
--- a/testsuites/itrontests/itronsem01/Makefile.am
+++ b/testsuites/itrontests/itronsem01/Makefile.am
@@ -2,32 +2,29 @@
 ## $Id$
 ##
 
-PGM = ${ARCH}/itronsem01.exe
-
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = itronsem01.exe
+itronsem01_exe_SOURCES = init.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = itronsem01.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = itronsem01.doc
 
-OBJS = $(lib_a_OBJECTS)
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+itronsem01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itronsem01_exe_OBJECTS) $(itronsem01_exe_LDADD)
+LINK_LIBS = $(itronsem01_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+itronsem01.exe$(EXEEXT): $(itronsem01_exe_OBJECTS) $(itronsem01_exe_DEPENDENCIES)
+	@rm -f itronsem01.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask01/Makefile.am b/testsuites/itrontests/itrontask01/Makefile.am
index 54d6817850..3682072559 100644
--- a/testsuites/itrontests/itrontask01/Makefile.am
+++ b/testsuites/itrontests/itrontask01/Makefile.am
@@ -2,32 +2,29 @@
 ## $Id$
 ##
 
-PGM = ${ARCH}/itrontask01.exe
-
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c system.h
+rtems_tests_PROGRAMS = itrontask01.exe
+itrontask01_exe_SOURCES = init.c task1.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = itrontask01.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = itrontask01.doc
 
-OBJS = $(lib_a_OBJECTS)
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+itrontask01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itrontask01_exe_OBJECTS) $(itrontask01_exe_LDADD)
+LINK_LIBS = $(itrontask01_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+itrontask01.exe$(EXEEXT): $(itrontask01_exe_OBJECTS) $(itrontask01_exe_DEPENDENCIES)
+	@rm -f itrontask01.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask02/Makefile.am b/testsuites/itrontests/itrontask02/Makefile.am
index 866f30267d..649da06055 100644
--- a/testsuites/itrontests/itrontask02/Makefile.am
+++ b/testsuites/itrontests/itrontask02/Makefile.am
@@ -2,32 +2,29 @@
 ## $Id$
 ##
 
-PGM = ${ARCH}/itrontask02.exe
-
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c dormant.c system.h
+rtems_tests_PROGRAMS = itrontask02.exe
+itrontask02_exe_SOURCES = init.c dormant.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = itrontask02.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = itrontask02.doc
 
-OBJS = $(lib_a_OBJECTS)
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+itrontask02_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itrontask02_exe_OBJECTS) $(itrontask02_exe_LDADD)
+LINK_LIBS = $(itrontask02_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+itrontask02.exe$(EXEEXT): $(itrontask02_exe_OBJECTS) $(itrontask02_exe_DEPENDENCIES)
+	@rm -f itrontask02.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask03/Makefile.am b/testsuites/itrontests/itrontask03/Makefile.am
index a1bb5a0349..e1c63c7b90 100644
--- a/testsuites/itrontests/itrontask03/Makefile.am
+++ b/testsuites/itrontests/itrontask03/Makefile.am
@@ -2,32 +2,29 @@
 ## $Id$
 ##
 
-PGM = ${ARCH}/itrontask03.exe
-
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c preempt.c task1.c task2.c task3.c system.h
+rtems_tests_PROGRAMS = itrontask03.exe
+itrontask03_exe_SOURCES = init.c preempt.c task1.c task2.c task3.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = itrontask03.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = itrontask03.doc
 
-OBJS = $(lib_a_OBJECTS)
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+itrontask03_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itrontask03_exe_OBJECTS) $(itrontask03_exe_LDADD)
+LINK_LIBS = $(itrontask03_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+itrontask03.exe$(EXEEXT): $(itrontask03_exe_OBJECTS) $(itrontask03_exe_DEPENDENCIES)
+	@rm -f itrontask03.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontask04/Makefile.am b/testsuites/itrontests/itrontask04/Makefile.am
index 9672582ba1..d9bc3adf0b 100644
--- a/testsuites/itrontests/itrontask04/Makefile.am
+++ b/testsuites/itrontests/itrontask04/Makefile.am
@@ -2,32 +2,29 @@
 ## $Id$
 ##
 
-PGM = ${ARCH}/itrontask04.exe
-
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c task1.c task2.c task3.c system.h
+rtems_tests_PROGRAMS = itrontask04.exe
+itrontask04_exe_SOURCES = init.c task1.c task2.c task3.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = itrontask04.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = itrontask04.doc
 
-OBJS = $(lib_a_OBJECTS)
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+itrontask04_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itrontask04_exe_OBJECTS) $(itrontask04_exe_LDADD)
+LINK_LIBS = $(itrontask04_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+itrontask04.exe$(EXEEXT): $(itrontask04_exe_OBJECTS) $(itrontask04_exe_DEPENDENCIES)
+	@rm -f itrontask04.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/itrontests/itrontime01/Makefile.am b/testsuites/itrontests/itrontime01/Makefile.am
index 9e51654861..4fd888bc91 100644
--- a/testsuites/itrontests/itrontime01/Makefile.am
+++ b/testsuites/itrontests/itrontime01/Makefile.am
@@ -2,32 +2,29 @@
 ## $Id$
 ##
 
-PGM = ${ARCH}/itrontime01.exe
-
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = itrontime01.exe
+itrontime01_exe_SOURCES = init.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = itrontime01.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = itrontime01.doc
 
-OBJS = $(lib_a_OBJECTS)
-
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+itrontime01_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(itrontime01_exe_OBJECTS) $(itrontime01_exe_LDADD)
+LINK_LIBS = $(itrontime01_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+itrontime01.exe$(EXEEXT): $(itrontime01_exe_OBJECTS) $(itrontime01_exe_DEPENDENCIES)
+	@rm -f itrontime01.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am