2011-12-08 Joel Sherrill <joel.sherrill@oarcorp.com>

	PR 1589/build
	* base_mp/node1/Makefile.am, base_mp/node2/Makefile.am,
	base_sp/Makefile.am, capture/Makefile.am, cdtest/Makefile.am,
	fileio/Makefile.am, hello/Makefile.am, iostream/Makefile.am,
	loopback/Makefile.am, minimum/Makefile.am, nsecs/Makefile.am,
	paranoia/Makefile.am, pppd/Makefile.am, ticker/Makefile.am,
	unlimited/Makefile.am: Remove obsolete optional manager capability.

16 files changed, 25 insertions, 48 deletions

diff --git a/testsuites/samples/ChangeLog b/testsuites/samples/ChangeLog
index 983c21c6cb..6d01464863 100644
--- a/testsuites/samples/ChangeLog
+++ b/testsuites/samples/ChangeLog
@@ -1,3 +1,13 @@
+2011-12-08	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	PR 1589/build
+	* base_mp/node1/Makefile.am, base_mp/node2/Makefile.am,
+	base_sp/Makefile.am, capture/Makefile.am, cdtest/Makefile.am,
+	fileio/Makefile.am, hello/Makefile.am, iostream/Makefile.am,
+	loopback/Makefile.am, minimum/Makefile.am, nsecs/Makefile.am,
+	paranoia/Makefile.am, pppd/Makefile.am, ticker/Makefile.am,
+	unlimited/Makefile.am: Remove obsolete optional manager capability.
+
 2011-10-18	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* fileio/init.c: Explictly cast consts in size_t initializers
diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
index 9dd1f5b128..af6e7616ab 100644
--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ b/testsuites/samples/base_mp/node1/Makefile.am
@@ -2,8 +2,6 @@
 ##  $Id$
 ##
 
-MANAGERS = all
-
 rtems_tests_PROGRAMS = base_mp-node1
 base_mp_node1_SOURCES = ../init.c ../apptask.c ../system.h
 
@@ -14,12 +12,10 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-base_mp_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-
 AM_CPPFLAGS += -DNODE_NUMBER=1 -I.
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(base_mp_node1_OBJECTS) $(base_mp_node1_LDADD)
+LINK_OBJS = 
 LINK_LIBS = $(base_mp_node1_LDLIBS)
 
 base_mp-node1$(EXEEXT): $(base_mp_node1_OBJECTS) $(base_mp_node1_DEPENDENCIES)
diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
index 86ed309ca8..7d276a8d21 100644
--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ b/testsuites/samples/base_mp/node2/Makefile.am
@@ -2,8 +2,6 @@
 ##  $Id$
 ##
 
-MANAGERS = all
-
 rtems_tests_PROGRAMS = base_mp-node2
 base_mp_node2_SOURCES = ../init.c ../apptask.c ../system.h
 
@@ -14,12 +12,10 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-base_mp_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-
 AM_CPPFLAGS += -DNODE_NUMBER=2 -I.
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(base_mp_node2_OBJECTS) $(base_mp_node2_LDADD)
+LINK_OBJS = 
 LINK_LIBS = $(base_mp_node2_LDLIBS)
 
 base_mp-node2$(EXEEXT): $(base_mp_node2_OBJECTS) $(base_mp_node2_DEPENDENCIES)
diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am
index faac1d0c41..917f9613d1 100644
--- a/testsuites/samples/base_sp/Makefile.am
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = base_sp
 base_sp_SOURCES = init.c apptask.c system.h
@@ -16,9 +15,8 @@ include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-base_sp_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(base_sp_OBJECTS) $(base_sp_LDADD)
+LINK_OBJS = $(base_sp_OBJECTS)
 LINK_LIBS = $(base_sp_LDLIBS)
 
 base_sp$(EXEEXT): $(base_sp_OBJECTS) $(base_sp_DEPENDENCIES)
diff --git a/testsuites/samples/capture/Makefile.am b/testsuites/samples/capture/Makefile.am
index 4b79faadba..dfa1d59a9a 100644
--- a/testsuites/samples/capture/Makefile.am
+++ b/testsuites/samples/capture/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = capture
 capture_SOURCES = init.c test1.c system.h
@@ -14,9 +13,8 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-capture_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(capture_OBJECTS) $(capture_LDADD)
+LINK_OBJS = $(capture_OBJECTS)
 LINK_LIBS = $(capture_LDLIBS)
 
 capture$(EXEEXT): $(capture_OBJECTS) $(capture_DEPENDENCIES)
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index 738b95c7e1..73763adcb0 100644
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = cdtest
 cdtest_SOURCES = init.c main.cc system.h
@@ -13,13 +12,12 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-cdtest_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 # AM_CPPFLAGS += -DRTEMS_TEST_IO_STREAM
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(cdtest_OBJECTS) $(cdtest_LDADD)
+LINK_OBJS = $(cdtest_OBJECTS)
 LINK_LIBS = $(cdtest_LDLIBS)
 
 cdtest$(EXEEXT): $(cdtest_OBJECTS) $(cdtest_DEPENDENCIES)
diff --git a/testsuites/samples/fileio/Makefile.am b/testsuites/samples/fileio/Makefile.am
index 38e6e9cbaf..0b1f4ae7eb 100644
--- a/testsuites/samples/fileio/Makefile.am
+++ b/testsuites/samples/fileio/Makefile.am
@@ -2,7 +2,6 @@
 ##  Makefile.am,v 1.9 2002/08/11 05:18:59 ralf Exp
 ##
 
-MANAGERS = io message semaphore
 
 rtems_tests_PROGRAMS = fileio
 fileio_SOURCES = init.c system.h
@@ -13,11 +12,10 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-fileio_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(fileio_OBJECTS) $(fileio_LDADD)
+LINK_OBJS = $(fileio_OBJECTS)
 LINK_LIBS = $(fileio_LDLIBS)
 
 fileio$(EXEEXT): $(fileio_OBJECTS) $(fileio_DEPENDENCIES)
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index e7b019be30..94cf69f293 100644
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = hello
 hello_SOURCES = init.c
@@ -14,9 +13,8 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-hello_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(hello_OBJECTS) $(hello_LDADD)
+LINK_OBJS = $(hello_OBJECTS)
 LINK_LIBS = $(hello_LDLIBS)
 
 hello$(EXEEXT): $(hello_OBJECTS) $(hello_DEPENDENCIES)
diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am
index d47caccdf0..3eb4e3c96e 100644
--- a/testsuites/samples/iostream/Makefile.am
+++ b/testsuites/samples/iostream/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = cxx_iostream
 cxx_iostream_SOURCES = init.cc system.h
@@ -14,9 +13,8 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-cxx_iostream_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(cxx_iostream_OBJECTS) $(cxx_iostream_LDADD)
+LINK_OBJS = $(cxx_iostream_OBJECTS)
 LINK_LIBS = $(cxx_iostream_LDLIBS)
 
 cxx_iostream$(EXEEXT): $(cxx_iostream_OBJECTS) $(cxx_iostream_DEPENDENCIES)
diff --git a/testsuites/samples/loopback/Makefile.am b/testsuites/samples/loopback/Makefile.am
index 761735ff33..4d65cbc03b 100644
--- a/testsuites/samples/loopback/Makefile.am
+++ b/testsuites/samples/loopback/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = loopback
 loopback_SOURCES = init.c
@@ -13,9 +12,8 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-loopback_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(loopback_OBJECTS) $(loopback_LDADD)
+LINK_OBJS = $(loopback_OBJECTS)
 LINK_LIBS = $(loopback_LDLIBS)
 
 loopback$(EXEEXT): $(loopback_OBJECTS) $(loopback_DEPENDENCIES)
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
index f850d1f81b..2d567e43b6 100644
--- a/testsuites/samples/minimum/Makefile.am
+++ b/testsuites/samples/minimum/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-MANAGERS = 
 
 rtems_tests_PROGRAMS = minimum
 minimum_SOURCES = init.c
@@ -14,11 +13,10 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-minimum_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 # 	This test should not be executed
 
-LINK_OBJS = $(minimum_OBJECTS) $(minimum_LDADD)
+LINK_OBJS = $(minimum_OBJECTS)
 LINK_LIBS = $(minimum_LDLIBS)
 
 minimum$(EXEEXT): $(minimum_OBJECTS) $(minimum_DEPENDENCIES)
diff --git a/testsuites/samples/nsecs/Makefile.am b/testsuites/samples/nsecs/Makefile.am
index de6a959486..2c82f17ccd 100644
--- a/testsuites/samples/nsecs/Makefile.am
+++ b/testsuites/samples/nsecs/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = nsecs
 nsecs_SOURCES = init.c empty.c
@@ -16,7 +15,7 @@ include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(nsecs_OBJECTS) $(nsecs_LDADD)
+LINK_OBJS = $(nsecs_OBJECTS)
 LINK_LIBS = $(nsecs_LDLIBS)
 
 nsecs$(EXEEXT): $(nsecs_OBJECTS) $(nsecs_DEPENDENCIES)
diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index 959fc6cf37..ab9830e5a4 100644
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = paranoia
 paranoia_SOURCES = init.c paranoia.c system.h
@@ -13,14 +12,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-paranoia_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 #  -DCYGNUS   turns on more verbose msgs
 AM_CPPFLAGS += -DNOSIGNAL -DCYGNUS -DNOMAIN
 
 paranoia_LDLIBS = -lm
 
-LINK_OBJS = $(paranoia_OBJECTS) $(paranoia_LDADD)
+LINK_OBJS = $(paranoia_OBJECTS)
 LINK_LIBS = $(paranoia_LDLIBS)
 
 paranoia$(EXEEXT): $(paranoia_OBJECTS) $(paranoia_DEPENDENCIES)
diff --git a/testsuites/samples/pppd/Makefile.am b/testsuites/samples/pppd/Makefile.am
index 0ec23cde40..94f4b6eab8 100644
--- a/testsuites/samples/pppd/Makefile.am
+++ b/testsuites/samples/pppd/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = pppd
 pppd_SOURCES = init.c pppdapp.c netconfig.h system.h
@@ -11,11 +10,10 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-pppd_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 pppd_LDLIBS = -lpppd
 
-LINK_OBJS = $(pppd_OBJECTS) $(pppd_LDADD)
+LINK_OBJS = $(pppd_OBJECTS)
 LINK_LIBS = $(pppd_LDLIBS)
 
 pppd$(EXEEXT): $(pppd_OBJECTS) $(pppd_DEPENDENCIES)
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
index 7801413ae6..f099c8c6f9 100644
--- a/testsuites/samples/ticker/Makefile.am
+++ b/testsuites/samples/ticker/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = ticker
 ticker_SOURCES = init.c tasks.c system.h
@@ -14,11 +13,10 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../automake/compile.am
 include $(top_srcdir)/../automake/leaf.am
 
-ticker_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(ticker_OBJECTS) $(ticker_LDADD)
+LINK_OBJS = $(ticker_OBJECTS)
 LINK_LIBS = $(ticker_LDLIBS)
 
 ticker$(EXEEXT): $(ticker_OBJECTS) $(ticker_DEPENDENCIES)
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
index c4ec1d53e4..d839f11269 100644
--- a/testsuites/samples/unlimited/Makefile.am
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-MANAGERS = io event semaphore
 
 rtems_tests_PROGRAMS = unlimited
 unlimited_SOURCES = init.c test1.c test2.c test3.c system.h
@@ -16,9 +15,8 @@ include $(top_srcdir)/../automake/leaf.am
 
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-unlimited_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
-LINK_OBJS = $(unlimited_OBJECTS) $(unlimited_LDADD)
+LINK_OBJS = $(unlimited_OBJECTS)
 LINK_LIBS = $(unlimited_LDLIBS)
 
 unlimited$(EXEEXT): $(unlimited_OBJECTS) $(unlimited_DEPENDENCIES)