Index: testsuites/samples/ChangeLog
===================================================================
--- testsuites/samples/ChangeLog	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/ChangeLog	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -1,2 +1,12 @@
+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>
 
Index: testsuites/samples/base_mp/node1/Makefile.am
===================================================================
--- testsuites/samples/base_mp/node1/Makefile.am	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/base_mp/node1/Makefile.am	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -2,6 +2,4 @@
 ##  $Id$
 ##
-
-MANAGERS = all
 
 rtems_tests_PROGRAMS = base_mp-node1
@@ -15,10 +13,8 @@
 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)
 
Index: testsuites/samples/base_mp/node2/Makefile.am
===================================================================
--- testsuites/samples/base_mp/node2/Makefile.am	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/base_mp/node2/Makefile.am	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -2,6 +2,4 @@
 ##  $Id$
 ##
-
-MANAGERS = all
 
 rtems_tests_PROGRAMS = base_mp-node2
@@ -15,10 +13,8 @@
 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)
 
Index: testsuites/samples/base_sp/Makefile.am
===================================================================
--- testsuites/samples/base_sp/Makefile.am	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/base_sp/Makefile.am	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -3,5 +3,4 @@
 ##
 
-MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = base_sp
@@ -17,7 +16,6 @@
 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)
 
Index: testsuites/samples/capture/Makefile.am
===================================================================
--- testsuites/samples/capture/Makefile.am	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/capture/Makefile.am	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -3,5 +3,4 @@
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = capture
@@ -15,7 +14,6 @@
 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)
 
Index: testsuites/samples/cdtest/Makefile.am
===================================================================
--- testsuites/samples/cdtest/Makefile.am	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/cdtest/Makefile.am	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -3,5 +3,4 @@
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = cdtest
@@ -14,5 +13,4 @@
 include $(top_srcdir)/../automake/leaf.am
 
-cdtest_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 # AM_CPPFLAGS += -DRTEMS_TEST_IO_STREAM
@@ -20,5 +18,5 @@
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(cdtest_OBJECTS) $(cdtest_LDADD)
+LINK_OBJS = $(cdtest_OBJECTS)
 LINK_LIBS = $(cdtest_LDLIBS)
 
Index: testsuites/samples/fileio/Makefile.am
===================================================================
--- testsuites/samples/fileio/Makefile.am	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/fileio/Makefile.am	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -3,5 +3,4 @@
 ##
 
-MANAGERS = io message semaphore
 
 rtems_tests_PROGRAMS = fileio
@@ -14,9 +13,8 @@
 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)
 
Index: testsuites/samples/hello/Makefile.am
===================================================================
--- testsuites/samples/hello/Makefile.am	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/hello/Makefile.am	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -3,5 +3,4 @@
 ##
 
-MANAGERS = io semaphore
 
 rtems_tests_PROGRAMS = hello
@@ -15,7 +14,6 @@
 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)
 
Index: testsuites/samples/iostream/Makefile.am
===================================================================
--- testsuites/samples/iostream/Makefile.am	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/iostream/Makefile.am	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -3,5 +3,4 @@
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = cxx_iostream
@@ -15,7 +14,6 @@
 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)
 
Index: testsuites/samples/loopback/Makefile.am
===================================================================
--- testsuites/samples/loopback/Makefile.am	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/loopback/Makefile.am	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -3,5 +3,4 @@
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = loopback
@@ -14,7 +13,6 @@
 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)
 
Index: testsuites/samples/minimum/Makefile.am
===================================================================
--- testsuites/samples/minimum/Makefile.am	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/minimum/Makefile.am	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -3,5 +3,4 @@
 ##
 
-MANAGERS = 
 
 rtems_tests_PROGRAMS = minimum
@@ -15,9 +14,8 @@
 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)
 
Index: testsuites/samples/nsecs/Makefile.am
===================================================================
--- testsuites/samples/nsecs/Makefile.am	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/nsecs/Makefile.am	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -3,5 +3,4 @@
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = nsecs
@@ -17,5 +16,5 @@
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(nsecs_OBJECTS) $(nsecs_LDADD)
+LINK_OBJS = $(nsecs_OBJECTS)
 LINK_LIBS = $(nsecs_LDLIBS)
 
Index: testsuites/samples/paranoia/Makefile.am
===================================================================
--- testsuites/samples/paranoia/Makefile.am	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/paranoia/Makefile.am	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -3,5 +3,4 @@
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = paranoia
@@ -14,5 +13,4 @@
 include $(top_srcdir)/../automake/leaf.am
 
-paranoia_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 #  -DCYGNUS   turns on more verbose msgs
@@ -21,5 +19,5 @@
 paranoia_LDLIBS = -lm
 
-LINK_OBJS = $(paranoia_OBJECTS) $(paranoia_LDADD)
+LINK_OBJS = $(paranoia_OBJECTS)
 LINK_LIBS = $(paranoia_LDLIBS)
 
Index: testsuites/samples/pppd/Makefile.am
===================================================================
--- testsuites/samples/pppd/Makefile.am	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/pppd/Makefile.am	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -3,5 +3,4 @@
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = pppd
@@ -12,9 +11,8 @@
 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)
 
Index: testsuites/samples/ticker/Makefile.am
===================================================================
--- testsuites/samples/ticker/Makefile.am	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/ticker/Makefile.am	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -3,5 +3,4 @@
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = ticker
@@ -15,9 +14,8 @@
 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)
 
Index: testsuites/samples/unlimited/Makefile.am
===================================================================
--- testsuites/samples/unlimited/Makefile.am	(revision 5e9990b85c1c95bb425b18a05ba2efb5d79b33f1)
+++ testsuites/samples/unlimited/Makefile.am	(revision cd06294a08d5f38eb6740506487006d0090deac6)
@@ -3,5 +3,4 @@
 ##
 
-MANAGERS = io event semaphore
 
 rtems_tests_PROGRAMS = unlimited
@@ -17,7 +16,6 @@
 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)
 
