summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2011-12-08 21:38:31 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2011-12-08 21:38:31 +0000
commit341aaf8a77049b3a9e0c7230a4ac849c3c60c403 (patch)
tree7551e11b24a6ea5683f8b55d4b689a54c595ceba
parent2011-12-08 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
downloadrtems-341aaf8a77049b3a9e0c7230a4ac849c3c60c403.tar.bz2
2011-12-08 Joel Sherrill <joel.sherrill@oarcorp.com>
PR 1589/build * smp01/Makefile.am, smp02/Makefile.am, smp03/Makefile.am, smp04/Makefile.am, smp05/Makefile.am, smp06/Makefile.am, smp07/Makefile.am, smp08/Makefile.am, smp09/Makefile.am: Remove obsolete optional manager capability.
-rw-r--r--testsuites/smptests/ChangeLog8
-rw-r--r--testsuites/smptests/smp01/Makefile.am3
-rw-r--r--testsuites/smptests/smp02/Makefile.am4
-rw-r--r--testsuites/smptests/smp03/Makefile.am4
-rw-r--r--testsuites/smptests/smp04/Makefile.am4
-rw-r--r--testsuites/smptests/smp05/Makefile.am3
-rw-r--r--testsuites/smptests/smp06/Makefile.am3
-rw-r--r--testsuites/smptests/smp07/Makefile.am3
-rw-r--r--testsuites/smptests/smp08/Makefile.am4
-rw-r--r--testsuites/smptests/smp09/Makefile.am3
10 files changed, 17 insertions, 22 deletions
diff --git a/testsuites/smptests/ChangeLog b/testsuites/smptests/ChangeLog
index fa90a476fe..f6fcdcc3e8 100644
--- a/testsuites/smptests/ChangeLog
+++ b/testsuites/smptests/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-08 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ PR 1589/build
+ * smp01/Makefile.am, smp02/Makefile.am, smp03/Makefile.am,
+ smp04/Makefile.am, smp05/Makefile.am, smp06/Makefile.am,
+ smp07/Makefile.am, smp08/Makefile.am, smp09/Makefile.am: Remove
+ obsolete optional manager capability.
+
2011-09-29 Ralf Corsépius <ralf.corsepius@rtems.org>
* smp05/init.c, smp06/init.c, smp07/init.c, smp09/init.c:
diff --git a/testsuites/smptests/smp01/Makefile.am b/testsuites/smptests/smp01/Makefile.am
index a112880372..3fd2183744 100644
--- a/testsuites/smptests/smp01/Makefile.am
+++ b/testsuites/smptests/smp01/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-MANAGERS = all
rtems_tests_PROGRAMS = smp01
smp01_SOURCES = init.c tasks.c system.h ../../support/src/locked_print.c
@@ -17,7 +16,7 @@ include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
AM_CPPFLAGS += -DSMPTEST
-LINK_OBJS = $(smp01_OBJECTS) $(smp01_LDADD)
+LINK_OBJS = $(smp01_OBJECTS)
LINK_LIBS = $(smp01_LDLIBS)
smp01$(EXEEXT): $(smp01_OBJECTS) $(smp01_DEPENDENCIES)
diff --git a/testsuites/smptests/smp02/Makefile.am b/testsuites/smptests/smp02/Makefile.am
index 01ae429605..61c60bd369 100644
--- a/testsuites/smptests/smp02/Makefile.am
+++ b/testsuites/smptests/smp02/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-MANAGERS = all
rtems_tests_PROGRAMS = smp02
smp02_SOURCES = init.c tasks.c system.h ../../support/src/locked_print.c
@@ -17,9 +16,8 @@ include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
AM_CPPFLAGS += -DSMPTEST
-smp02_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-LINK_OBJS = $(smp02_OBJECTS) $(smp02_LDADD)
+LINK_OBJS = $(smp02_OBJECTS)
LINK_LIBS = $(smp02_LDLIBS)
smp02$(EXEEXT): $(smp02_OBJECTS) $(smp02_DEPENDENCIES)
diff --git a/testsuites/smptests/smp03/Makefile.am b/testsuites/smptests/smp03/Makefile.am
index d3483b9ef4..73f2967d5a 100644
--- a/testsuites/smptests/smp03/Makefile.am
+++ b/testsuites/smptests/smp03/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-MANAGERS = all
rtems_tests_PROGRAMS = smp03
smp03_SOURCES = init.c tasks.c system.h ../../support/src/locked_print.c
@@ -17,9 +16,8 @@ include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
AM_CPPFLAGS += -DSMPTEST
-smp03_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-LINK_OBJS = $(smp03_OBJECTS) $(smp03_LDADD)
+LINK_OBJS = $(smp03_OBJECTS)
LINK_LIBS = $(smp03_LDLIBS)
smp03$(EXEEXT): $(smp03_OBJECTS) $(smp03_DEPENDENCIES)
diff --git a/testsuites/smptests/smp04/Makefile.am b/testsuites/smptests/smp04/Makefile.am
index 232f515334..3579e94f78 100644
--- a/testsuites/smptests/smp04/Makefile.am
+++ b/testsuites/smptests/smp04/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-MANAGERS = all
rtems_tests_PROGRAMS = smp04
smp04_SOURCES = init.c system.h ../../support/src/locked_print.c
@@ -17,9 +16,8 @@ include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
AM_CPPFLAGS += -DSMPTEST
-smp04_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-LINK_OBJS = $(smp04_OBJECTS) $(smp04_LDADD)
+LINK_OBJS = $(smp04_OBJECTS)
LINK_LIBS = $(smp04_LDLIBS)
smp04$(EXEEXT): $(smp04_OBJECTS) $(smp04_DEPENDENCIES)
diff --git a/testsuites/smptests/smp05/Makefile.am b/testsuites/smptests/smp05/Makefile.am
index dfb6483488..6db395d304 100644
--- a/testsuites/smptests/smp05/Makefile.am
+++ b/testsuites/smptests/smp05/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-MANAGERS = all
rtems_tests_PROGRAMS = smp05
smp05_SOURCES = init.c ../../support/src/locked_print.c
@@ -17,7 +16,7 @@ include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
AM_CPPFLAGS += -DSMPTEST
-LINK_OBJS = $(smp05_OBJECTS) $(smp05_LDADD)
+LINK_OBJS = $(smp05_OBJECTS)
LINK_LIBS = $(smp05_LDLIBS)
smp05$(EXEEXT): $(smp05_OBJECTS) $(smp05_DEPENDENCIES)
diff --git a/testsuites/smptests/smp06/Makefile.am b/testsuites/smptests/smp06/Makefile.am
index 5c88d2ffc5..fe6fcacb4c 100644
--- a/testsuites/smptests/smp06/Makefile.am
+++ b/testsuites/smptests/smp06/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-MANAGERS = all
rtems_tests_PROGRAMS = smp06
smp06_SOURCES = init.c ../../support/src/locked_print.c
@@ -17,7 +16,7 @@ include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
AM_CPPFLAGS += -DSMPTEST
-LINK_OBJS = $(smp06_OBJECTS) $(smp06_LDADD)
+LINK_OBJS = $(smp06_OBJECTS)
LINK_LIBS = $(smp06_LDLIBS)
smp06$(EXEEXT): $(smp06_OBJECTS) $(smp06_DEPENDENCIES)
diff --git a/testsuites/smptests/smp07/Makefile.am b/testsuites/smptests/smp07/Makefile.am
index de140d87bf..b94fa1675a 100644
--- a/testsuites/smptests/smp07/Makefile.am
+++ b/testsuites/smptests/smp07/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-MANAGERS = all
rtems_tests_PROGRAMS = smp07
smp07_SOURCES = init.c ../../support/src/locked_print.c
@@ -17,7 +16,7 @@ include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
AM_CPPFLAGS += -DSMPTEST
-LINK_OBJS = $(smp07_OBJECTS) $(smp07_LDADD)
+LINK_OBJS = $(smp07_OBJECTS)
LINK_LIBS = $(smp07_LDLIBS)
smp07$(EXEEXT): $(smp07_OBJECTS) $(smp07_DEPENDENCIES)
diff --git a/testsuites/smptests/smp08/Makefile.am b/testsuites/smptests/smp08/Makefile.am
index 5c8d735dd8..04748a6db2 100644
--- a/testsuites/smptests/smp08/Makefile.am
+++ b/testsuites/smptests/smp08/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-MANAGERS = all
rtems_tests_PROGRAMS = smp08
smp08_SOURCES = init.c tasks.c system.h ../../support/src/locked_print.c
@@ -17,9 +16,8 @@ include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
AM_CPPFLAGS += -DSMPTEST
-smp08_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
-LINK_OBJS = $(smp08_OBJECTS) $(smp08_LDADD)
+LINK_OBJS = $(smp08_OBJECTS)
LINK_LIBS = $(smp08_LDLIBS)
smp08$(EXEEXT): $(smp08_OBJECTS) $(smp08_DEPENDENCIES)
diff --git a/testsuites/smptests/smp09/Makefile.am b/testsuites/smptests/smp09/Makefile.am
index 8c4178d951..453ddef267 100644
--- a/testsuites/smptests/smp09/Makefile.am
+++ b/testsuites/smptests/smp09/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-MANAGERS = all
rtems_tests_PROGRAMS = smp09
smp09_SOURCES = init.c ../../support/src/locked_print.c
@@ -17,7 +16,7 @@ include $(top_srcdir)/../automake/leaf.am
AM_CPPFLAGS += -I$(top_srcdir)/../support/include
AM_CPPFLAGS += -DSMPTEST
-LINK_OBJS = $(smp09_OBJECTS) $(smp09_LDADD)
+LINK_OBJS = $(smp09_OBJECTS)
LINK_LIBS = $(smp09_LDLIBS)
smp09$(EXEEXT): $(smp09_OBJECTS) $(smp09_DEPENDENCIES)