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

	PR 1589/build
	* psxtmbarrier01/Makefile.am, psxtmbarrier02/Makefile.am,
	psxtmbarrier03/Makefile.am, psxtmkey01/Makefile.am,
	psxtmkey02/Makefile.am, psxtmmq01/Makefile.am,
	psxtmmutex01/Makefile.am, psxtmmutex02/Makefile.am,
	psxtmmutex03/Makefile.am, psxtmmutex04/Makefile.am,
	psxtmmutex05/Makefile.am, psxtmmutex06/Makefile.am,
	psxtmmutex07/Makefile.am, psxtmnanosleep01/Makefile.am,
	psxtmnanosleep02/Makefile.am, psxtmrwlock01/Makefile.am,
	psxtmrwlock02/Makefile.am, psxtmrwlock03/Makefile.am,
	psxtmrwlock04/Makefile.am, psxtmrwlock05/Makefile.am,
	psxtmrwlock06/Makefile.am, psxtmrwlock07/Makefile.am,
	psxtmsem01/Makefile.am, psxtmsem02/Makefile.am,
	psxtmsem03/Makefile.am, psxtmsem04/Makefile.am,
	psxtmsem05/Makefile.am, psxtmsleep01/Makefile.am,
	psxtmsleep02/Makefile.am, psxtmthread01/Makefile.am,
	psxtmthread03/Makefile.am: Remove obsolete optional manager
	capability.

32 files changed, 52 insertions, 62 deletions

diff --git a/testsuites/psxtmtests/ChangeLog b/testsuites/psxtmtests/ChangeLog
index 6384277d35..0e731419d2 100644
--- a/testsuites/psxtmtests/ChangeLog
+++ b/testsuites/psxtmtests/ChangeLog
@@ -1,3 +1,24 @@
+2011-12-08	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	PR 1589/build
+	* psxtmbarrier01/Makefile.am, psxtmbarrier02/Makefile.am,
+	psxtmbarrier03/Makefile.am, psxtmkey01/Makefile.am,
+	psxtmkey02/Makefile.am, psxtmmq01/Makefile.am,
+	psxtmmutex01/Makefile.am, psxtmmutex02/Makefile.am,
+	psxtmmutex03/Makefile.am, psxtmmutex04/Makefile.am,
+	psxtmmutex05/Makefile.am, psxtmmutex06/Makefile.am,
+	psxtmmutex07/Makefile.am, psxtmnanosleep01/Makefile.am,
+	psxtmnanosleep02/Makefile.am, psxtmrwlock01/Makefile.am,
+	psxtmrwlock02/Makefile.am, psxtmrwlock03/Makefile.am,
+	psxtmrwlock04/Makefile.am, psxtmrwlock05/Makefile.am,
+	psxtmrwlock06/Makefile.am, psxtmrwlock07/Makefile.am,
+	psxtmsem01/Makefile.am, psxtmsem02/Makefile.am,
+	psxtmsem03/Makefile.am, psxtmsem04/Makefile.am,
+	psxtmsem05/Makefile.am, psxtmsleep01/Makefile.am,
+	psxtmsleep02/Makefile.am, psxtmthread01/Makefile.am,
+	psxtmthread03/Makefile.am: Remove obsolete optional manager
+	capability.
+
 2011-12-07	Joel Sherrill <joel.sherrill@oarcorp.com>
 
 	* psxtmtests_plan.csv: Add more test cases.
diff --git a/testsuites/psxtmtests/psxtmbarrier01/Makefile.am b/testsuites/psxtmtests/psxtmbarrier01/Makefile.am
index 2ced7bcd40..b9b17a3b83 100644
--- a/testsuites/psxtmtests/psxtmbarrier01/Makefile.am
+++ b/testsuites/psxtmtests/psxtmbarrier01/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmbarrier01
 psxtmbarrier01_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmbarrier01_OBJECTS) $(psxtmbarrier01_LDADD)
+LINK_OBJS = $(psxtmbarrier01_OBJECTS)
 LINK_LIBS = $(psxtmbarrier01_LDLIBS)
 
 psxtmbarrier01$(EXEEXT): $(psxtmbarrier01_OBJECTS) $(psxtmbarrier01_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmbarrier02/Makefile.am b/testsuites/psxtmtests/psxtmbarrier02/Makefile.am
index 716c53976a..124f2aca4e 100644
--- a/testsuites/psxtmtests/psxtmbarrier02/Makefile.am
+++ b/testsuites/psxtmtests/psxtmbarrier02/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmbarrier02
 psxtmbarrier02_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmbarrier02_OBJECTS) $(psxtmbarrier02_LDADD)
+LINK_OBJS = $(psxtmbarrier02_OBJECTS)
 LINK_LIBS = $(psxtmbarrier02_LDLIBS)
 
 psxtmbarrier02$(EXEEXT): $(psxtmbarrier02_OBJECTS) $(psxtmbarrier02_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmbarrier03/Makefile.am b/testsuites/psxtmtests/psxtmbarrier03/Makefile.am
index a686c8a91a..eaec3427eb 100644
--- a/testsuites/psxtmtests/psxtmbarrier03/Makefile.am
+++ b/testsuites/psxtmtests/psxtmbarrier03/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmbarrier03
 psxtmbarrier03_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmbarrier03_OBJECTS) $(psxtmbarrier03_LDADD)
+LINK_OBJS = $(psxtmbarrier03_OBJECTS)
 LINK_LIBS = $(psxtmbarrier03_LDLIBS)
 
 psxtmbarrier03$(EXEEXT): $(psxtmbarrier03_OBJECTS) $(psxtmbarrier03_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmkey01/Makefile.am b/testsuites/psxtmtests/psxtmkey01/Makefile.am
index 290b76c74c..dbe684de23 100644
--- a/testsuites/psxtmtests/psxtmkey01/Makefile.am
+++ b/testsuites/psxtmtests/psxtmkey01/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmkey01
 psxtmkey01_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmkey01_OBJECTS) $(psxtmkey01_LDADD)
+LINK_OBJS = $(psxtmkey01_OBJECTS)
 LINK_LIBS = $(psxtmkey01_LDLIBS)
 
 psxtmkey01$(EXEEXT): $(psxtmkey01_OBJECTS) $(psxtmkey01_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmkey02/Makefile.am b/testsuites/psxtmtests/psxtmkey02/Makefile.am
index f54ff6af39..80645c5e36 100644
--- a/testsuites/psxtmtests/psxtmkey02/Makefile.am
+++ b/testsuites/psxtmtests/psxtmkey02/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmkey02
 psxtmkey02_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmkey02_OBJECTS) $(psxtmkey02_LDADD)
+LINK_OBJS = $(psxtmkey02_OBJECTS)
 LINK_LIBS = $(psxtmkey02_LDLIBS)
 
 psxtmkey02$(EXEEXT): $(psxtmkey02_OBJECTS) $(psxtmkey02_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmmq01/Makefile.am b/testsuites/psxtmtests/psxtmmq01/Makefile.am
index b81e9ddcdd..703b568fe0 100644
--- a/testsuites/psxtmtests/psxtmmq01/Makefile.am
+++ b/testsuites/psxtmtests/psxtmmq01/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmmq01
 psxtmmq01_SOURCES  = init.c
@@ -21,7 +20,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmmq01_OBJECTS) $(psxtmmq01_LDADD)
+LINK_OBJS = $(psxtmmq01_OBJECTS)
 LINK_LIBS = $(psxtmmq01_LDLIBS)
 
 psxtmmq01$(EXEEXT): $(psxtmmq01_OBJECTS) $(psxtmmq01_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmmutex01/Makefile.am b/testsuites/psxtmtests/psxtmmutex01/Makefile.am
index 2ec2bfd6ad..31b53ea252 100644
--- a/testsuites/psxtmtests/psxtmmutex01/Makefile.am
+++ b/testsuites/psxtmtests/psxtmmutex01/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmmutex01
 psxtmmutex01_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmmutex01_OBJECTS) $(psxtmmutex01_LDADD)
+LINK_OBJS = $(psxtmmutex01_OBJECTS)
 LINK_LIBS = $(psxtmmutex01_LDLIBS)
 
 psxtmmutex01$(EXEEXT): $(psxtmmutex01_OBJECTS) $(psxtmmutex01_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmmutex02/Makefile.am b/testsuites/psxtmtests/psxtmmutex02/Makefile.am
index 8072e1806d..b0405cf751 100644
--- a/testsuites/psxtmtests/psxtmmutex02/Makefile.am
+++ b/testsuites/psxtmtests/psxtmmutex02/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmmutex02
 psxtmmutex02_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmmutex02_OBJECTS) $(psxtmmutex02_LDADD)
+LINK_OBJS = $(psxtmmutex02_OBJECTS)
 LINK_LIBS = $(psxtmmutex02_LDLIBS)
 
 psxtmmutex02$(EXEEXT): $(psxtmmutex02_OBJECTS) $(psxtmmutex02_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmmutex03/Makefile.am b/testsuites/psxtmtests/psxtmmutex03/Makefile.am
index 5a4a1d3a4e..37a2857cb5 100644
--- a/testsuites/psxtmtests/psxtmmutex03/Makefile.am
+++ b/testsuites/psxtmtests/psxtmmutex03/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmmutex03
 psxtmmutex03_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmmutex03_OBJECTS) $(psxtmmutex03_LDADD)
+LINK_OBJS = $(psxtmmutex03_OBJECTS)
 LINK_LIBS = $(psxtmmutex03_LDLIBS)
 
 psxtmmutex03$(EXEEXT): $(psxtmmutex03_OBJECTS) $(psxtmmutex03_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmmutex04/Makefile.am b/testsuites/psxtmtests/psxtmmutex04/Makefile.am
index 8839b8f0bf..d0a9c88205 100644
--- a/testsuites/psxtmtests/psxtmmutex04/Makefile.am
+++ b/testsuites/psxtmtests/psxtmmutex04/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmmutex04
 psxtmmutex04_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmmutex04_OBJECTS) $(psxtmmutex04_LDADD)
+LINK_OBJS = $(psxtmmutex04_OBJECTS)
 LINK_LIBS = $(psxtmmutex04_LDLIBS)
 
 psxtmmutex04$(EXEEXT): $(psxtmmutex04_OBJECTS) $(psxtmmutex04_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmmutex05/Makefile.am b/testsuites/psxtmtests/psxtmmutex05/Makefile.am
index 20c0116235..9afabe24cd 100644
--- a/testsuites/psxtmtests/psxtmmutex05/Makefile.am
+++ b/testsuites/psxtmtests/psxtmmutex05/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmmutex05
 psxtmmutex05_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmmutex05_OBJECTS) $(psxtmmutex05_LDADD)
+LINK_OBJS = $(psxtmmutex05_OBJECTS)
 LINK_LIBS = $(psxtmmutex05_LDLIBS)
 
 psxtmmutex05$(EXEEXT): $(psxtmmutex05_OBJECTS) $(psxtmmutex05_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmmutex06/Makefile.am b/testsuites/psxtmtests/psxtmmutex06/Makefile.am
index ec568e3a6f..10e60e16c4 100644
--- a/testsuites/psxtmtests/psxtmmutex06/Makefile.am
+++ b/testsuites/psxtmtests/psxtmmutex06/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmmutex06
 psxtmmutex06_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmmutex06_OBJECTS) $(psxtmmutex06_LDADD)
+LINK_OBJS = $(psxtmmutex06_OBJECTS)
 LINK_LIBS = $(psxtmmutex06_LDLIBS)
 
 psxtmmutex06$(EXEEXT): $(psxtmmutex06_OBJECTS) $(psxtmmutex06_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmmutex07/Makefile.am b/testsuites/psxtmtests/psxtmmutex07/Makefile.am
index c573099fd0..052a00a8f4 100644
--- a/testsuites/psxtmtests/psxtmmutex07/Makefile.am
+++ b/testsuites/psxtmtests/psxtmmutex07/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmmutex07
 psxtmmutex07_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmmutex07_OBJECTS) $(psxtmmutex07_LDADD)
+LINK_OBJS = $(psxtmmutex07_OBJECTS)
 LINK_LIBS = $(psxtmmutex07_LDLIBS)
 
 psxtmmutex07$(EXEEXT): $(psxtmmutex07_OBJECTS) $(psxtmmutex07_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmnanosleep01/Makefile.am b/testsuites/psxtmtests/psxtmnanosleep01/Makefile.am
index 16c6e1855a..b69aa3d8a7 100644
--- a/testsuites/psxtmtests/psxtmnanosleep01/Makefile.am
+++ b/testsuites/psxtmtests/psxtmnanosleep01/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmnanosleep01
 psxtmnanosleep01_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmnanosleep01_OBJECTS) $(psxtmnanosleep01_LDADD)
+LINK_OBJS = $(psxtmnanosleep01_OBJECTS)
 LINK_LIBS = $(psxtmnanosleep01_LDLIBS)
 
 psxtmnanosleep01$(EXEEXT): $(psxtmnanosleep01_OBJECTS) $(psxtmnanosleep01_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmnanosleep02/Makefile.am b/testsuites/psxtmtests/psxtmnanosleep02/Makefile.am
index 45b270a2b7..c44d76e4ab 100644
--- a/testsuites/psxtmtests/psxtmnanosleep02/Makefile.am
+++ b/testsuites/psxtmtests/psxtmnanosleep02/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmnanosleep02
 psxtmnanosleep02_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmnanosleep02_OBJECTS) $(psxtmnanosleep02_LDADD)
+LINK_OBJS = $(psxtmnanosleep02_OBJECTS)
 LINK_LIBS = $(psxtmnanosleep02_LDLIBS)
 
 psxtmnanosleep02$(EXEEXT): $(psxtmnanosleep02_OBJECTS) $(psxtmnanosleep02_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmrwlock01/Makefile.am b/testsuites/psxtmtests/psxtmrwlock01/Makefile.am
index aad366917f..53cfc98e9d 100644
--- a/testsuites/psxtmtests/psxtmrwlock01/Makefile.am
+++ b/testsuites/psxtmtests/psxtmrwlock01/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmrwlock01
 psxtmrwlock01_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmrwlock01_OBJECTS) $(psxtmrwlock01_LDADD)
+LINK_OBJS = $(psxtmrwlock01_OBJECTS)
 LINK_LIBS = $(psxtmrwlock01_LDLIBS)
 
 psxtmrwlock01$(EXEEXT): $(psxtmrwlock01_OBJECTS) $(psxtmrwlock01_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmrwlock02/Makefile.am b/testsuites/psxtmtests/psxtmrwlock02/Makefile.am
index 1854be4061..60812de84d 100644
--- a/testsuites/psxtmtests/psxtmrwlock02/Makefile.am
+++ b/testsuites/psxtmtests/psxtmrwlock02/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmrwlock02
 psxtmrwlock02_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmrwlock02_OBJECTS) $(psxtmrwlock02_LDADD)
+LINK_OBJS = $(psxtmrwlock02_OBJECTS)
 LINK_LIBS = $(psxtmrwlock02_LDLIBS)
 
 psxtmrwlock02$(EXEEXT): $(psxtmrwlock02_OBJECTS) $(psxtmrwlock02_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmrwlock03/Makefile.am b/testsuites/psxtmtests/psxtmrwlock03/Makefile.am
index 13650f4861..5b6e84385b 100644
--- a/testsuites/psxtmtests/psxtmrwlock03/Makefile.am
+++ b/testsuites/psxtmtests/psxtmrwlock03/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmrwlock03
 psxtmrwlock03_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmrwlock03_OBJECTS) $(psxtmrwlock03_LDADD)
+LINK_OBJS = $(psxtmrwlock03_OBJECTS)
 LINK_LIBS = $(psxtmrwlock03_LDLIBS)
 
 psxtmrwlock03$(EXEEXT): $(psxtmrwlock03_OBJECTS) $(psxtmrwlock03_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmrwlock04/Makefile.am b/testsuites/psxtmtests/psxtmrwlock04/Makefile.am
index 502f8bfd26..4e78c0bfe0 100644
--- a/testsuites/psxtmtests/psxtmrwlock04/Makefile.am
+++ b/testsuites/psxtmtests/psxtmrwlock04/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmrwlock04
 psxtmrwlock04_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmrwlock04_OBJECTS) $(psxtmrwlock04_LDADD)
+LINK_OBJS = $(psxtmrwlock04_OBJECTS)
 LINK_LIBS = $(psxtmrwlock04_LDLIBS)
 
 psxtmrwlock04$(EXEEXT): $(psxtmrwlock04_OBJECTS) $(psxtmrwlock04_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmrwlock05/Makefile.am b/testsuites/psxtmtests/psxtmrwlock05/Makefile.am
index f45b5126e2..77aaf7ce1f 100644
--- a/testsuites/psxtmtests/psxtmrwlock05/Makefile.am
+++ b/testsuites/psxtmtests/psxtmrwlock05/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmrwlock05
 psxtmrwlock05_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmrwlock05_OBJECTS) $(psxtmrwlock05_LDADD)
+LINK_OBJS = $(psxtmrwlock05_OBJECTS)
 LINK_LIBS = $(psxtmrwlock05_LDLIBS)
 
 psxtmrwlock05$(EXEEXT): $(psxtmrwlock05_OBJECTS) $(psxtmrwlock05_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmrwlock06/Makefile.am b/testsuites/psxtmtests/psxtmrwlock06/Makefile.am
index 806e85df7f..eb33adbb76 100644
--- a/testsuites/psxtmtests/psxtmrwlock06/Makefile.am
+++ b/testsuites/psxtmtests/psxtmrwlock06/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmrwlock06
 psxtmrwlock06_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmrwlock06_OBJECTS) $(psxtmrwlock06_LDADD)
+LINK_OBJS = $(psxtmrwlock06_OBJECTS)
 LINK_LIBS = $(psxtmrwlock06_LDLIBS)
 
 psxtmrwlock06$(EXEEXT): $(psxtmrwlock06_OBJECTS) $(psxtmrwlock06_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmrwlock07/Makefile.am b/testsuites/psxtmtests/psxtmrwlock07/Makefile.am
index 63b336a4bb..67789eba59 100644
--- a/testsuites/psxtmtests/psxtmrwlock07/Makefile.am
+++ b/testsuites/psxtmtests/psxtmrwlock07/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmrwlock07
 psxtmrwlock07_SOURCES  = init.c
@@ -21,7 +20,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmrwlock07_OBJECTS) $(psxtmrwlock07_LDADD)
+LINK_OBJS = $(psxtmrwlock07_OBJECTS)
 LINK_LIBS = $(psxtmrwlock07_LDLIBS)
 
 psxtmrwlock07$(EXEEXT): $(psxtmrwlock07_OBJECTS) $(psxtmrwlock07_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmsem01/Makefile.am b/testsuites/psxtmtests/psxtmsem01/Makefile.am
index 23f58aa70b..6da44a7d8a 100644
--- a/testsuites/psxtmtests/psxtmsem01/Makefile.am
+++ b/testsuites/psxtmtests/psxtmsem01/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmsem01
 psxtmsem01_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmsem01_OBJECTS) $(psxtmsem01_LDADD)
+LINK_OBJS = $(psxtmsem01_OBJECTS)
 LINK_LIBS = $(psxtmsem01_LDLIBS)
 
 psxtmsem01$(EXEEXT): $(psxtmsem01_OBJECTS) $(psxtmsem01_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmsem02/Makefile.am b/testsuites/psxtmtests/psxtmsem02/Makefile.am
index 7147dc3b79..4d9f413eb6 100644
--- a/testsuites/psxtmtests/psxtmsem02/Makefile.am
+++ b/testsuites/psxtmtests/psxtmsem02/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmsem02
 psxtmsem02_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmsem02_OBJECTS) $(psxtmsem02_LDADD)
+LINK_OBJS = $(psxtmsem02_OBJECTS)
 LINK_LIBS = $(psxtmsem02_LDLIBS)
 
 psxtmsem02$(EXEEXT): $(psxtmsem02_OBJECTS) $(psxtmsem02_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmsem03/Makefile.am b/testsuites/psxtmtests/psxtmsem03/Makefile.am
index aa8603ae79..f217bebe14 100644
--- a/testsuites/psxtmtests/psxtmsem03/Makefile.am
+++ b/testsuites/psxtmtests/psxtmsem03/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmsem03
 psxtmsem03_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmsem03_OBJECTS) $(psxtmsem03_LDADD)
+LINK_OBJS = $(psxtmsem03_OBJECTS)
 LINK_LIBS = $(psxtmsem03_LDLIBS)
 
 psxtmsem03$(EXEEXT): $(psxtmsem03_OBJECTS) $(psxtmsem03_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmsem04/Makefile.am b/testsuites/psxtmtests/psxtmsem04/Makefile.am
index 4929299472..84d770ab07 100644
--- a/testsuites/psxtmtests/psxtmsem04/Makefile.am
+++ b/testsuites/psxtmtests/psxtmsem04/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmsem04
 psxtmsem04_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmsem04_OBJECTS) $(psxtmsem04_LDADD)
+LINK_OBJS = $(psxtmsem04_OBJECTS)
 LINK_LIBS = $(psxtmsem04_LDLIBS)
 
 psxtmsem04$(EXEEXT): $(psxtmsem04_OBJECTS) $(psxtmsem04_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmsem05/Makefile.am b/testsuites/psxtmtests/psxtmsem05/Makefile.am
index cd3277d79e..68e915dc1b 100644
--- a/testsuites/psxtmtests/psxtmsem05/Makefile.am
+++ b/testsuites/psxtmtests/psxtmsem05/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmsem05
 psxtmsem05_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmsem05_OBJECTS) $(psxtmsem05_LDADD)
+LINK_OBJS = $(psxtmsem05_OBJECTS)
 LINK_LIBS = $(psxtmsem05_LDLIBS)
 
 psxtmsem05$(EXEEXT): $(psxtmsem05_OBJECTS) $(psxtmsem05_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmsleep01/Makefile.am b/testsuites/psxtmtests/psxtmsleep01/Makefile.am
index 248a2ba021..1d1ff44256 100644
--- a/testsuites/psxtmtests/psxtmsleep01/Makefile.am
+++ b/testsuites/psxtmtests/psxtmsleep01/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmsleep01
 psxtmsleep01_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmsleep01_OBJECTS) $(psxtmsleep01_LDADD)
+LINK_OBJS = $(psxtmsleep01_OBJECTS)
 LINK_LIBS = $(psxtmsleep01_LDLIBS)
 
 psxtmsleep01$(EXEEXT): $(psxtmsleep01_OBJECTS) $(psxtmsleep01_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmsleep02/Makefile.am b/testsuites/psxtmtests/psxtmsleep02/Makefile.am
index 470daf595e..1dd6b97c81 100644
--- a/testsuites/psxtmtests/psxtmsleep02/Makefile.am
+++ b/testsuites/psxtmtests/psxtmsleep02/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmsleep02
 psxtmsleep02_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmsleep02_OBJECTS) $(psxtmsleep02_LDADD)
+LINK_OBJS = $(psxtmsleep02_OBJECTS)
 LINK_LIBS = $(psxtmsleep02_LDLIBS)
 
 psxtmsleep02$(EXEEXT): $(psxtmsleep02_OBJECTS) $(psxtmsleep02_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmthread01/Makefile.am b/testsuites/psxtmtests/psxtmthread01/Makefile.am
index b46d1a3351..eb3fc3dc55 100644
--- a/testsuites/psxtmtests/psxtmthread01/Makefile.am
+++ b/testsuites/psxtmtests/psxtmthread01/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmthread01
 psxtmthread01_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmthread01_OBJECTS) $(psxtmthread01_LDADD)
+LINK_OBJS = $(psxtmthread01_OBJECTS)
 LINK_LIBS = $(psxtmthread01_LDLIBS)
 
 psxtmthread01$(EXEEXT): $(psxtmthread01_OBJECTS) $(psxtmthread01_DEPENDENCIES)
diff --git a/testsuites/psxtmtests/psxtmthread03/Makefile.am b/testsuites/psxtmtests/psxtmthread03/Makefile.am
index 46a4de404a..cd7680ff31 100644
--- a/testsuites/psxtmtests/psxtmthread03/Makefile.am
+++ b/testsuites/psxtmtests/psxtmthread03/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-MANAGERS = all
 
 rtems_tests_PROGRAMS = psxtmthread03
 psxtmthread03_SOURCES = init.c ../../tmtests/include/timesys.h \
@@ -20,7 +19,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/../tmtests/include
 AM_CPPFLAGS += -DOPERATION_COUNT=$(OPERATION_COUNT)
 AM_CPPFLAGS += -I$(top_srcdir)/../support/include
 
-LINK_OBJS = $(psxtmthread03_OBJECTS) $(psxtmthread03_LDADD)
+LINK_OBJS = $(psxtmthread03_OBJECTS)
 LINK_LIBS = $(psxtmthread03_LDLIBS)
 
 psxtmthread03$(EXEEXT): $(psxtmthread03_OBJECTS) $(psxtmthread03_DEPENDENCIES)