From a6b588d649d6fcc933aa356f3c36a1d2f6391976 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Sun, 13 Nov 2005 06:46:05 +0000
Subject: Convert to using *_PROGRAMS.

---
 testsuites/samples/base_mp/node1/Makefile.am | 21 +++++++++------------
 testsuites/samples/base_mp/node2/Makefile.am | 21 +++++++++------------
 testsuites/samples/base_sp/Makefile.am       | 21 +++++++++------------
 testsuites/samples/cdtest/Makefile.am        | 20 +++++++++-----------
 testsuites/samples/fileio/Makefile.am        | 19 ++++++++-----------
 testsuites/samples/hello/Makefile.am         | 21 +++++++++------------
 testsuites/samples/iostream/Makefile.am      | 22 ++++++++++------------
 testsuites/samples/loopback/Makefile.am      | 19 ++++++++-----------
 testsuites/samples/minimum/Makefile.am       | 21 +++++++++------------
 testsuites/samples/paranoia/Makefile.am      | 22 +++++++++-------------
 testsuites/samples/pppd/Makefile.am          | 20 ++++++++------------
 testsuites/samples/ticker/Makefile.am        | 21 +++++++++------------
 testsuites/samples/unlimited/Makefile.am     | 21 +++++++++------------
 13 files changed, 115 insertions(+), 154 deletions(-)

(limited to 'testsuites/samples')

diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
index 589bb1828f..588096a573 100644
--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ b/testsuites/samples/base_mp/node1/Makefile.am
@@ -2,32 +2,29 @@
 ##  $Id$
 ##
 
-PGM = ${ARCH}/base_mp-node1.exe
-
 MANAGERS = io mp
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../apptask.c ../system.h
+rtems_tests_PROGRAMS = base_mp-node1.exe
+base_mp_node1_exe_SOURCES = ../init.c ../apptask.c ../system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = base_mp-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = base_mp-node1.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)
+base_mp_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I.
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(base_mp_node1_exe_OBJECTS) $(base_mp_node1_exe_LDADD)
+LINK_LIBS = $(base_mp_node1_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+base_mp-node1.exe$(EXEEXT): $(base_mp_node1_exe_OBJECTS) $(base_mp_node1_exe_DEPENDENCIES)
+	@rm -f base_mp-node1.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
index 6f1b23800e..474418808d 100644
--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ b/testsuites/samples/base_mp/node2/Makefile.am
@@ -2,32 +2,29 @@
 ##  $Id$
 ##
 
-PGM = ${ARCH}/base_mp-node2.exe
-
 MANAGERS = io mp
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = ../init.c ../apptask.c ../system.h
+rtems_tests_PROGRAMS = base_mp-node2.exe
+base_mp_node2_exe_SOURCES = ../init.c ../apptask.c ../system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = base_mp-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = base_mp-node2.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)
+base_mp_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I.
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(base_mp_node2_exe_OBJECTS) $(base_mp_node2_exe_LDADD)
+LINK_LIBS = $(base_mp_node2_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+base_mp-node2.exe$(EXEEXT): $(base_mp_node2_exe_OBJECTS) $(base_mp_node2_exe_DEPENDENCIES)
+	@rm -f base_mp-node2.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am
index 71dfbf6111..6974a9ee5a 100644
--- a/testsuites/samples/base_sp/Makefile.am
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -2,30 +2,27 @@
 ##  $Id$
 ##
 
-PGM = ${ARCH}/base_sp.exe
-
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c apptask.c system.h
+rtems_tests_PROGRAMS = base_sp.exe
+base_sp_exe_SOURCES = init.c apptask.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = base_sp.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = base_sp.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)
+base_sp_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(base_sp_exe_OBJECTS) $(base_sp_exe_LDADD)
+LINK_LIBS = $(base_sp_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+base_sp.exe$(EXEEXT): $(base_sp_exe_OBJECTS) $(base_sp_exe_DEPENDENCIES)
+	@rm -f base_sp.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index ecab477989..e8d93e122f 100644
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -2,32 +2,30 @@
 ##  $Id$
 ##
 
-PGM = ${ARCH}/cdtest.exe
-
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c main.cc system.h
+rtems_tests_PROGRAMS = cdtest.exe
+cdtest_exe_SOURCES = init.c main.cc system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = cdtest.scn
 
-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)
+cdtest_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 # AM_CPPFLAGS += -DRTEMS_TEST_IO_STREAM
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(cdtest_exe_OBJECTS) $(cdtest_exe_LDADD)
+LINK_LIBS = $(cdtest_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+cdtest.exe$(EXEEXT): $(cdtest_exe_OBJECTS) $(cdtest_exe_DEPENDENCIES)
+	@rm -f cdtest.exe$(EXEEXT)
+	$(make-exe)
 	$(make-cxx-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am
index 2f3e7579c9..ecaaaa570f 100644
--- a/testsuites/samples/fileio/Makefile.am
+++ b/testsuites/samples/fileio/Makefile.am
@@ -2,18 +2,14 @@
 ##  Makefile.am,v 1.9 2002/08/11 05:18:59 ralf Exp
 ##
 
-
 MANAGERS = io message semaphore
 
 if LIBCHIP
-PGM = ${ARCH}/fileio.exe
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
-OBJS = $(lib_a_OBJECTS)
+rtems_tests_PROGRAMS = fileio.exe
+fileio_exe_SOURCES = init.c system.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = fileio.doc
 endif
 
@@ -21,13 +17,14 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-
 if LIBCHIP
-$(PGM): ${ARCH}/$(dirstamp)
+fileio_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(fileio_exe_OBJECTS) $(fileio_exe_LDADD)
+LINK_LIBS = $(fileio_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+fileio.exe$(EXEEXT): $(fileio_exe_OBJECTS) $(fileio_exe_DEPENDENCIES)
+	@rm -f fileio.exe$(EXEEXT)
 	$(make-exe)
 endif
 
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index f10bd46fde..200c3e08a8 100644
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -2,30 +2,27 @@
 ##  $Id$
 ##
 
-PGM = ${ARCH}/hello.exe
-
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c system.h
+rtems_tests_PROGRAMS = hello.exe
+hello_exe_SOURCES = init.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = hello.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = hello.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)
+hello_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(hello_exe_OBJECTS) $(hello_exe_LDADD)
+LINK_LIBS = $(hello_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+hello.exe$(EXEEXT): $(hello_exe_OBJECTS) $(hello_exe_DEPENDENCIES)
+	@rm -f hello.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am
index 3b18f6120a..a50e972d07 100644
--- a/testsuites/samples/iostream/Makefile.am
+++ b/testsuites/samples/iostream/Makefile.am
@@ -2,30 +2,28 @@
 ##  $Id$
 ##
 
-PGM = ${ARCH}/iostream.exe
-
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.cc system.h
+rtems_tests_PROGRAMS = iostream.exe
+iostream_exe_SOURCES = init.cc system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = iostream.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = iostream.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)
+iostream_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(iostream_exe_OBJECTS) $(iostream_exe_LDADD)
+LINK_LIBS = $(iostream_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+iostream.exe$(EXEEXT): $(iostream_exe_OBJECTS) $(iostream_exe_DEPENDENCIES)
+	@rm -f iostream.exe$(EXEEXT)
+	$(make-exe)
 	$(make-cxx-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am
index 471b33628a..1cd69f6504 100644
--- a/testsuites/samples/loopback/Makefile.am
+++ b/testsuites/samples/loopback/Makefile.am
@@ -2,28 +2,25 @@
 ##  $Id$
 ##
 
-PGM = ${ARCH}/loopback.exe
-
 MANAGERS = io event
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c
+rtems_tests_PROGRAMS = loopback.exe
+loopback_exe_SOURCES = init.c
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = loopback.scn
 
-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)
+loopback_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(loopback_exe_OBJECTS) $(loopback_exe_LDADD)
+LINK_LIBS = $(loopback_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+loopback.exe$(EXEEXT): $(loopback_exe_OBJECTS) $(loopback_exe_DEPENDENCIES)
+	@rm -f loopback.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
index d9e2f52b52..e321b15028 100644
--- a/testsuites/samples/minimum/Makefile.am
+++ b/testsuites/samples/minimum/Makefile.am
@@ -2,32 +2,29 @@
 ##  $Id$
 ##
 
-PGM = ${ARCH}/minimum.exe
-
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c
+rtems_tests_PROGRAMS = minimum.exe
+minimum_exe_SOURCES = init.c
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = minimum.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = minimum.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)
+minimum_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 # 	This test should not be executed
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(minimum_exe_OBJECTS) $(minimum_exe_LDADD)
+LINK_LIBS = $(minimum_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+minimum.exe$(EXEEXT): $(minimum_exe_OBJECTS) $(minimum_exe_DEPENDENCIES)
+	@rm -f minimum.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index 3509d54348..ca23ff87ea 100644
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -2,34 +2,30 @@
 ##  $Id$
 ##
 
-PGM = ${ARCH}/paranoia.exe
-
 MANAGERS = all
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c paranoia.c system.h
+rtems_tests_PROGRAMS = paranoia.exe
+paranoia_exe_SOURCES = init.c paranoia.c system.h
 
-testsdir = $(libdir)/tests
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = paranoia.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)
+paranoia_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 #  -DCYGNUS   turns on more verbose msgs
 AM_CPPFLAGS += -DNOSIGNAL -DCYGNUS -DNOMAIN
 
-LD_LIBS = -lm
+paranoia_exe_LDLIBS = -lm
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(paranoia_exe_OBJECTS) $(paranoia_exe_LDADD)
+LINK_LIBS = $(paranoia_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+paranoia.exe$(EXEEXT): $(paranoia_exe_OBJECTS) $(paranoia_exe_DEPENDENCIES)
+	@rm -f paranoia.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am
index d7b37fd9e7..9aec709f6c 100644
--- a/testsuites/samples/pppd/Makefile.am
+++ b/testsuites/samples/pppd/Makefile.am
@@ -2,28 +2,24 @@
 ##  $Id$
 ##
 
-PGM = ${ARCH}/pppd.exe
-
 MANAGERS = io event semaphore
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c pppdapp.c netconfig.h system.h
-
-OBJS = $(lib_a_OBJECTS)
-
-testsdir = $(libdir)/tests
+rtems_tests_PROGRAMS = pppd.exe
+pppd_exe_SOURCES = init.c pppdapp.c netconfig.h system.h
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-$(PGM): ${ARCH}/$(dirstamp)
+pppd_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LD_LIBS = -lpppd
+pppd_exe_LDLIBS = -lpppd
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(pppd_exe_OBJECTS) $(pppd_exe_LDADD)
+LINK_LIBS = $(pppd_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+pppd.exe$(EXEEXT): $(pppd_exe_OBJECTS) $(pppd_exe_DEPENDENCIES)
+	@rm -f pppd.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
index 15ff8ad8d9..4676da5113 100644
--- a/testsuites/samples/ticker/Makefile.am
+++ b/testsuites/samples/ticker/Makefile.am
@@ -2,30 +2,27 @@
 ##  $Id$
 ##
 
-PGM = ${ARCH}/ticker.exe
-
 MANAGERS = io
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c tasks.c system.h
+rtems_tests_PROGRAMS = ticker.exe
+ticker_exe_SOURCES = init.c tasks.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = ticker.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = ticker.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)
+ticker_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(ticker_exe_OBJECTS) $(ticker_exe_LDADD)
+LINK_LIBS = $(ticker_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+ticker.exe$(EXEEXT): $(ticker_exe_OBJECTS) $(ticker_exe_DEPENDENCIES)
+	@rm -f ticker.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
index 98c4f47934..0c512a634e 100644
--- a/testsuites/samples/unlimited/Makefile.am
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -2,30 +2,27 @@
 ##  $Id$
 ##
 
-PGM = ${ARCH}/unlimited.exe
-
 MANAGERS = io event
 
-noinst_LIBRARIES = lib.a
-lib_a_SOURCES = init.c test1.c test2.c test3.c system.h
+rtems_tests_PROGRAMS = unlimited.exe
+unlimited_exe_SOURCES = init.c test1.c test2.c test3.c system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = unlimited.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = unlimited.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)
+unlimited_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(unlimited_exe_OBJECTS) $(unlimited_exe_LDADD)
+LINK_LIBS = $(unlimited_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+unlimited.exe$(EXEEXT): $(unlimited_exe_OBJECTS) $(unlimited_exe_DEPENDENCIES)
+	@rm -f unlimited.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
-- 
cgit v1.2.3