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/mptests/mp14/node1/Makefile.am | 21 +++++++++------------
 testsuites/mptests/mp14/node2/Makefile.am | 21 +++++++++------------
 2 files changed, 18 insertions(+), 24 deletions(-)

(limited to 'testsuites/mptests/mp14')

diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am
index 403683229d..29c06bf210 100644
--- a/testsuites/mptests/mp14/node1/Makefile.am
+++ b/testsuites/mptests/mp14/node1/Makefile.am
@@ -2,36 +2,33 @@
 ## $Id$
 ##
 
-PGM = $(ARCH)/mp14-node1.exe
-
 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 \
+rtems_tests_PROGRAMS = mp14-node1.exe
+mp14_node1_exe_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
     ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = mp14-node1.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = mp14-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)
+mp14_node1_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/..
 AM_CPPFLAGS += -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp14_node1_exe_OBJECTS) $(mp14_node1_exe_LDADD)
+LINK_LIBS = $(mp14_node1_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+mp14-node1.exe$(EXEEXT): $(mp14_node1_exe_OBJECTS) $(mp14_node1_exe_DEPENDENCIES)
+	@rm -f mp14-node1.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am
index 373291ab29..5a4ce979da 100644
--- a/testsuites/mptests/mp14/node2/Makefile.am
+++ b/testsuites/mptests/mp14/node2/Makefile.am
@@ -2,36 +2,33 @@
 ## $Id$
 ##
 
-PGM = $(ARCH)/mp14-node2.exe
-
 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 \
+rtems_tests_PROGRAMS = mp14-node2.exe
+mp14_node2_exe_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \
     ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h
 
-testsdir = $(libdir)/tests
-scndir = $(testsdir)
+scndir = $(rtems_testsdir)
 dist_scn_DATA = mp14-node2.scn
-docdir = $(testsdir)
+docdir = $(rtems_testsdir)
 dist_doc_DATA = mp14-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)
+mp14_node2_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/..
 AM_CPPFLAGS += -DMAX_LONG_TEST_DURATION=$(MAX_LONG_TEST_DURATION)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-tests_SCRIPTS = $(PGM)
+LINK_OBJS = $(mp14_node2_exe_OBJECTS) $(mp14_node2_exe_LDADD)
+LINK_LIBS = $(mp14_node2_exe_LDLIBS)
 
-$(PGM): $(OBJS) $(LINK_FILES)
+mp14-node2.exe$(EXEEXT): $(mp14_node2_exe_OBJECTS) $(mp14_node2_exe_DEPENDENCIES)
+	@rm -f mp14-node2.exe$(EXEEXT)
 	$(make-exe)
 
 include $(top_srcdir)/../automake/local.am
-- 
cgit v1.2.3