diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-12-08 21:38:16 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-12-08 21:38:16 +0000 |
| commit | d056639013526c117e0bff65676067e30755a74f (patch) | |
| tree | f3824180da60b6f5e173d5d2697ea71527ba860c /testsuites/mptests | |
| parent | 2011-12-08 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-d056639013526c117e0bff65676067e30755a74f.tar.bz2 | |
2011-12-08 Joel Sherrill <joel.sherrill@oarcorp.com>
PR 1589/build
* mp01/node1/Makefile.am, mp01/node2/Makefile.am,
mp02/node1/Makefile.am, mp02/node2/Makefile.am,
mp03/node1/Makefile.am, mp03/node2/Makefile.am,
mp04/node1/Makefile.am, mp04/node2/Makefile.am,
mp05/node1/Makefile.am, mp05/node2/Makefile.am,
mp06/node1/Makefile.am, mp06/node2/Makefile.am,
mp07/node1/Makefile.am, mp07/node2/Makefile.am,
mp08/node1/Makefile.am, mp08/node2/Makefile.am,
mp09/node1/Makefile.am, mp09/node2/Makefile.am,
mp10/node1/Makefile.am, mp10/node2/Makefile.am,
mp11/node1/Makefile.am, mp11/node2/Makefile.am,
mp12/node1/Makefile.am, mp12/node2/Makefile.am,
mp13/node1/Makefile.am, mp13/node2/Makefile.am,
mp14/node1/Makefile.am, mp14/node2/Makefile.am: Remove obsolete
optional manager capability.
Diffstat (limited to 'testsuites/mptests')
29 files changed, 47 insertions, 140 deletions
diff --git a/testsuites/mptests/ChangeLog b/testsuites/mptests/ChangeLog index 5e01a7bbf8..c7a282dffe 100644 --- a/testsuites/mptests/ChangeLog +++ b/testsuites/mptests/ChangeLog @@ -1,3 +1,22 @@ +2011-12-08 Joel Sherrill <joel.sherrill@oarcorp.com> + + PR 1589/build + * mp01/node1/Makefile.am, mp01/node2/Makefile.am, + mp02/node1/Makefile.am, mp02/node2/Makefile.am, + mp03/node1/Makefile.am, mp03/node2/Makefile.am, + mp04/node1/Makefile.am, mp04/node2/Makefile.am, + mp05/node1/Makefile.am, mp05/node2/Makefile.am, + mp06/node1/Makefile.am, mp06/node2/Makefile.am, + mp07/node1/Makefile.am, mp07/node2/Makefile.am, + mp08/node1/Makefile.am, mp08/node2/Makefile.am, + mp09/node1/Makefile.am, mp09/node2/Makefile.am, + mp10/node1/Makefile.am, mp10/node2/Makefile.am, + mp11/node1/Makefile.am, mp11/node2/Makefile.am, + mp12/node1/Makefile.am, mp12/node2/Makefile.am, + mp13/node1/Makefile.am, mp13/node2/Makefile.am, + mp14/node1/Makefile.am, mp14/node2/Makefile.am: Remove obsolete + optional manager capability. + 2011-02-22 Ralf Corsépius <ralf.corsepius@rtems.org> * configure.ac: Add AC_CONFIG_HEADER(config.h). diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am index b98220a345..56263828ff 100644 --- a/testsuites/mptests/mp01/node1/Makefile.am +++ b/testsuites/mptests/mp01/node1/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp01-node1 mp01_node1_SOURCES = ../init.c ../task1.c ../system.h @@ -17,9 +15,7 @@ include $(top_srcdir)/../automake/leaf.am AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -mp01_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - -LINK_OBJS = $(mp01_node1_OBJECTS) $(mp01_node1_LDADD) +LINK_OBJS = LINK_LIBS = $(mp01_node1_LDLIBS) mp01-node1$(EXEEXT): $(mp01_node1_OBJECTS) $(mp01_node1_DEPENDENCIES) diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am index f7ed4e814d..328d60dd98 100644 --- a/testsuites/mptests/mp01/node2/Makefile.am +++ b/testsuites/mptests/mp01/node2/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp01-node2 mp01_node2_SOURCES = ../init.c ../task1.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp01_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp01_node2_OBJECTS) $(mp01_node2_LDADD) +LINK_OBJS = LINK_LIBS = $(mp01_node2_LDLIBS) mp01-node2$(EXEEXT): $(mp01_node2_OBJECTS) $(mp01_node2_DEPENDENCIES) diff --git a/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am index 3b5b751e9a..cbf482c2c9 100644 --- a/testsuites/mptests/mp02/node1/Makefile.am +++ b/testsuites/mptests/mp02/node1/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp02-node1 mp02_node1_SOURCES = ../init.c ../task1.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp02_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp02_node1_OBJECTS) $(mp02_node1_LDADD) +LINK_OBJS = LINK_LIBS = $(mp02_node1_LDLIBS) mp02-node1$(EXEEXT): $(mp02_node1_OBJECTS) $(mp02_node1_DEPENDENCIES) diff --git a/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am index 9db734b11e..5390685e36 100644 --- a/testsuites/mptests/mp02/node2/Makefile.am +++ b/testsuites/mptests/mp02/node2/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp02-node2 mp02_node2_SOURCES = ../init.c ../task1.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp02_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp02_node2_OBJECTS) $(mp02_node2_LDADD) +LINK_OBJS = LINK_LIBS = $(mp02_node2_LDLIBS) mp02-node2$(EXEEXT): $(mp02_node2_OBJECTS) $(mp02_node2_DEPENDENCIES) diff --git a/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am index c6306effe6..2bc98019a9 100644 --- a/testsuites/mptests/mp03/node1/Makefile.am +++ b/testsuites/mptests/mp03/node1/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp03-node1 mp03_node1_SOURCES = ../init.c ../task1.c ../delay.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp03_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp03_node1_OBJECTS) $(mp03_node1_LDADD) +LINK_OBJS = LINK_LIBS = $(mp03_node1_LDLIBS) mp03-node1$(EXEEXT): $(mp03_node1_OBJECTS) $(mp03_node1_DEPENDENCIES) diff --git a/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am index 84fc672ef7..3c3daa2dc7 100644 --- a/testsuites/mptests/mp03/node2/Makefile.am +++ b/testsuites/mptests/mp03/node2/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp03-node2 mp03_node2_SOURCES = ../init.c ../delay.c ../task1.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp03_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp03_node2_OBJECTS) $(mp03_node2_LDADD) +LINK_OBJS = LINK_LIBS = $(mp03_node2_LDLIBS) mp03-node2$(EXEEXT): $(mp03_node2_OBJECTS) $(mp03_node2_DEPENDENCIES) diff --git a/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am index 3f0321b14b..b53aac2012 100644 --- a/testsuites/mptests/mp04/node1/Makefile.am +++ b/testsuites/mptests/mp04/node1/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp04-node1 mp04_node1_SOURCES = ../init.c ../task1.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp04_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp04_node1_OBJECTS) $(mp04_node1_LDADD) +LINK_OBJS = LINK_LIBS = $(mp04_node1_LDLIBS) mp04-node1$(EXEEXT): $(mp04_node1_OBJECTS) $(mp04_node1_DEPENDENCIES) diff --git a/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am index 1041015ce6..ccce192965 100644 --- a/testsuites/mptests/mp04/node2/Makefile.am +++ b/testsuites/mptests/mp04/node2/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp04-node2 mp04_node2_SOURCES = ../init.c ../task1.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp04_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp04_node2_OBJECTS) $(mp04_node2_LDADD) +LINK_OBJS = LINK_LIBS = $(mp04_node2_LDLIBS) mp04-node2$(EXEEXT): $(mp04_node2_OBJECTS) $(mp04_node2_DEPENDENCIES) diff --git a/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am index d4dc09fa08..65a5273ab0 100644 --- a/testsuites/mptests/mp05/node1/Makefile.am +++ b/testsuites/mptests/mp05/node1/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp05-node1 mp05_node1_SOURCES = ../init.c ../asr.c ../task1.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp05_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp05_node1_OBJECTS) $(mp05_node1_LDADD) +LINK_OBJS = LINK_LIBS = $(mp05_node1_LDLIBS) mp05-node1$(EXEEXT): $(mp05_node1_OBJECTS) $(mp05_node1_DEPENDENCIES) diff --git a/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am index c9281f7670..71a4b7d000 100644 --- a/testsuites/mptests/mp05/node2/Makefile.am +++ b/testsuites/mptests/mp05/node2/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp05-node2 mp05_node2_SOURCES = ../init.c ../asr.c ../task1.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp05_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp05_node2_OBJECTS) $(mp05_node2_LDADD) +LINK_OBJS = LINK_LIBS = $(mp05_node2_LDLIBS) mp05-node2$(EXEEXT): $(mp05_node2_OBJECTS) $(mp05_node2_DEPENDENCIES) diff --git a/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am index 6d786e8b91..6938d44892 100644 --- a/testsuites/mptests/mp06/node1/Makefile.am +++ b/testsuites/mptests/mp06/node1/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp06-node1 mp06_node1_SOURCES = ../init.c ../task1.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp06_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp06_node1_OBJECTS) $(mp06_node1_LDADD) +LINK_OBJS = LINK_LIBS = $(mp06_node1_LDLIBS) mp06-node1$(EXEEXT): $(mp06_node1_OBJECTS) $(mp06_node1_DEPENDENCIES) diff --git a/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am index 79f15f2d99..df9b9305dd 100644 --- a/testsuites/mptests/mp06/node2/Makefile.am +++ b/testsuites/mptests/mp06/node2/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp06-node2 mp06_node2_SOURCES = ../init.c ../task1.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp06_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp06_node2_OBJECTS) $(mp06_node2_LDADD) +LINK_OBJS = LINK_LIBS = $(mp06_node2_LDLIBS) mp06-node2$(EXEEXT): $(mp06_node2_OBJECTS) $(mp06_node2_DEPENDENCIES) diff --git a/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am index 881db82b70..611c01ec7e 100644 --- a/testsuites/mptests/mp07/node1/Makefile.am +++ b/testsuites/mptests/mp07/node1/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp07-node1 mp07_node1_SOURCES = ../init.c ../task1.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp07_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp07_node1_OBJECTS) $(mp07_node1_LDADD) +LINK_OBJS = LINK_LIBS = $(mp07_node1_LDLIBS) mp07-node1$(EXEEXT): $(mp07_node1_OBJECTS) $(mp07_node1_DEPENDENCIES) diff --git a/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am index fff2532f95..54e5da8ad8 100644 --- a/testsuites/mptests/mp07/node2/Makefile.am +++ b/testsuites/mptests/mp07/node2/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp07-node2 mp07_node2_SOURCES = ../init.c ../task1.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp07_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp07_node2_OBJECTS) $(mp07_node2_LDADD) +LINK_OBJS = LINK_LIBS = $(mp07_node2_LDLIBS) mp07-node2$(EXEEXT): $(mp07_node2_OBJECTS) $(mp07_node2_DEPENDENCIES) diff --git a/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am index 3cb9604f0f..b3200920f0 100644 --- a/testsuites/mptests/mp08/node1/Makefile.am +++ b/testsuites/mptests/mp08/node1/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp08-node1 mp08_node1_SOURCES = ../init.c ../task1.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp08_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp08_node1_OBJECTS) $(mp08_node1_LDADD) +LINK_OBJS = LINK_LIBS = $(mp08_node1_LDLIBS) mp08-node1$(EXEEXT): $(mp08_node1_OBJECTS) $(mp08_node1_DEPENDENCIES) diff --git a/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am index 75052dd8be..634cea0462 100644 --- a/testsuites/mptests/mp08/node2/Makefile.am +++ b/testsuites/mptests/mp08/node2/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp08-node2 mp08_node2_SOURCES = ../init.c ../task1.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp08_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp08_node2_OBJECTS) $(mp08_node2_LDADD) +LINK_OBJS = LINK_LIBS = $(mp08_node2_LDLIBS) mp08-node2$(EXEEXT): $(mp08_node2_OBJECTS) $(mp08_node2_DEPENDENCIES) diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am index 04f9065dc5..563031d836 100644 --- a/testsuites/mptests/mp09/node1/Makefile.am +++ b/testsuites/mptests/mp09/node1/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp09-node1 mp09_node1_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp09_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp09_node1_OBJECTS) $(mp09_node1_LDADD) +LINK_OBJS = LINK_LIBS = $(mp09_node1_LDLIBS) mp09-node1$(EXEEXT): $(mp09_node1_OBJECTS) $(mp09_node1_DEPENDENCIES) diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am index be82e36d7c..21ea64971e 100644 --- a/testsuites/mptests/mp09/node2/Makefile.am +++ b/testsuites/mptests/mp09/node2/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp09-node2 mp09_node2_SOURCES = ../init.c ../task1.c ../recvmsg.c ../sendmsg.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp09_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp09_node2_OBJECTS) $(mp09_node2_LDADD) +LINK_OBJS = LINK_LIBS = $(mp09_node2_LDLIBS) mp09-node2$(EXEEXT): $(mp09_node2_OBJECTS) $(mp09_node2_DEPENDENCIES) diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am index e241d7a039..e530a85511 100644 --- a/testsuites/mptests/mp10/node1/Makefile.am +++ b/testsuites/mptests/mp10/node1/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp10-node1 mp10_node1_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp10_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp10_node1_OBJECTS) $(mp10_node1_LDADD) +LINK_OBJS = LINK_LIBS = $(mp10_node1_LDLIBS) mp10-node1$(EXEEXT): $(mp10_node1_OBJECTS) $(mp10_node1_DEPENDENCIES) diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am index 2678fdb8c5..afb4c243cf 100644 --- a/testsuites/mptests/mp10/node2/Makefile.am +++ b/testsuites/mptests/mp10/node2/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp10-node2 mp10_node2_SOURCES = ../init.c ../task1.c ../task2.c ../task3.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp10_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp10_node2_OBJECTS) $(mp10_node2_LDADD) +LINK_OBJS = LINK_LIBS = $(mp10_node2_LDLIBS) mp10-node2$(EXEEXT): $(mp10_node2_OBJECTS) $(mp10_node2_DEPENDENCIES) diff --git a/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am index 8aed220b11..cf32d4f2a5 100644 --- a/testsuites/mptests/mp11/node1/Makefile.am +++ b/testsuites/mptests/mp11/node1/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp11-node1 mp11_node1_SOURCES = ../init.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp11_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp11_node1_OBJECTS) $(mp11_node1_LDADD) +LINK_OBJS = LINK_LIBS = $(mp11_node1_LDLIBS) mp11-node1$(EXEEXT): $(mp11_node1_OBJECTS) $(mp11_node1_DEPENDENCIES) diff --git a/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am index 2c0b59c6cc..10bb018c93 100644 --- a/testsuites/mptests/mp11/node2/Makefile.am +++ b/testsuites/mptests/mp11/node2/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp11-node2 mp11_node2_SOURCES = ../init.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp11_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp11_node2_OBJECTS) $(mp11_node2_LDADD) +LINK_OBJS = LINK_LIBS = $(mp11_node2_LDLIBS) mp11-node2$(EXEEXT): $(mp11_node2_OBJECTS) $(mp11_node2_DEPENDENCIES) diff --git a/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am index 9442e02b22..3da789fa50 100644 --- a/testsuites/mptests/mp12/node1/Makefile.am +++ b/testsuites/mptests/mp12/node1/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp12-node1 mp12_node1_SOURCES = ../init.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp12_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp12_node1_OBJECTS) $(mp12_node1_LDADD) +LINK_OBJS = LINK_LIBS = $(mp12_node1_LDLIBS) mp12-node1$(EXEEXT): $(mp12_node1_OBJECTS) $(mp12_node1_DEPENDENCIES) diff --git a/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am index 2f1af4146b..49de47c289 100644 --- a/testsuites/mptests/mp12/node2/Makefile.am +++ b/testsuites/mptests/mp12/node2/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp12-node2 mp12_node2_SOURCES = ../init.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp12_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp12_node2_OBJECTS) $(mp12_node2_LDADD) +LINK_OBJS = LINK_LIBS = $(mp12_node2_LDLIBS) mp12-node2$(EXEEXT): $(mp12_node2_OBJECTS) $(mp12_node2_DEPENDENCIES) diff --git a/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am index 98d6ecff9b..3b222307c3 100644 --- a/testsuites/mptests/mp13/node1/Makefile.am +++ b/testsuites/mptests/mp13/node1/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp13-node1 mp13_node1_SOURCES = ../init.c ../task1.c ../task2.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp13_node1_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=1 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp13_node1_OBJECTS) $(mp13_node1_LDADD) +LINK_OBJS = LINK_LIBS = $(mp13_node1_LDLIBS) mp13-node1$(EXEEXT): $(mp13_node1_OBJECTS) $(mp13_node1_DEPENDENCIES) diff --git a/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am index 85ed17d8fb..7715fbed01 100644 --- a/testsuites/mptests/mp13/node2/Makefile.am +++ b/testsuites/mptests/mp13/node2/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp13-node2 mp13_node2_SOURCES = ../init.c ../task1.c ../task2.c ../system.h @@ -14,13 +12,11 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp13_node2_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) - AM_CPPFLAGS += -DNODE_NUMBER=2 -I$(srcdir)/.. AM_CPPFLAGS += -I$(top_srcdir)/../support/include -LINK_OBJS = $(mp13_node2_OBJECTS) $(mp13_node2_LDADD) +LINK_OBJS = LINK_LIBS = $(mp13_node2_LDLIBS) mp13-node2$(EXEEXT): $(mp13_node2_OBJECTS) $(mp13_node2_DEPENDENCIES) diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am index 9cc96bdcae..070f774687 100644 --- a/testsuites/mptests/mp14/node1/Makefile.am +++ b/testsuites/mptests/mp14/node1/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp14-node1 mp14_node1_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \ ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h @@ -15,14 +13,12 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp14_node1_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 -LINK_OBJS = $(mp14_node1_OBJECTS) $(mp14_node1_LDADD) +LINK_OBJS = LINK_LIBS = $(mp14_node1_LDLIBS) mp14-node1$(EXEEXT): $(mp14_node1_OBJECTS) $(mp14_node1_DEPENDENCIES) diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am index 572d0b048e..07c6def286 100644 --- a/testsuites/mptests/mp14/node2/Makefile.am +++ b/testsuites/mptests/mp14/node2/Makefile.am @@ -2,8 +2,6 @@ ## $Id$ ## -MANAGERS = all - rtems_tests_PROGRAMS = mp14-node2 mp14_node2_SOURCES = ../exit.c ../init.c ../delay.c ../evtask1.c ../evtmtask.c \ ../pttask1.c ../smtask1.c ../msgtask1.c ../system.h @@ -15,14 +13,12 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -mp14_node2_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 -LINK_OBJS = $(mp14_node2_OBJECTS) $(mp14_node2_LDADD) +LINK_OBJS = LINK_LIBS = $(mp14_node2_LDLIBS) mp14-node2$(EXEEXT): $(mp14_node2_OBJECTS) $(mp14_node2_DEPENDENCIES) |