Patch rtems-rc-19991117-8.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

to fix some minor bugs in the conversion to automake.
1999-11-22 19:23:10 +00:00
parent e31c63e5a8
commit de759c54f5
78 changed files with 4 additions and 78 deletions
--- a/c/src/tests/itrontests/Makefile.am
+++ b/c/src/tests/itrontests/Makefile.am
@@ -16,6 +16,5 @@ all-local: $(PREINSTALLDIRS)
 SUBDIRS = . itronhello itrontask01 itrontask02 itrontask03 itrontask04 \
    itronmbf01 itronmbox01 itronsem01 itrontime01

-
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
--- a/c/src/tests/samples/base_mp/Makefile.am
+++ b/c/src/tests/samples/base_mp/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SUBDIRS = node1 node2

--- a/c/src/tests/samples/base_mp/node1/Makefile.am
+++ b/c/src/tests/samples/base_mp/node1/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 VPATH = @srcdir@:@srcdir@/..

--- a/c/src/tests/samples/base_mp/node2/Makefile.am
+++ b/c/src/tests/samples/base_mp/node2/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 VPATH = @srcdir@:@srcdir@/..

--- a/c/src/tests/samples/base_sp/Makefile.am
+++ b/c/src/tests/samples/base_sp/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SAMPLE = base_sp
 PGM = ${ARCH}/$(SAMPLE).exe
--- a/c/src/tests/samples/cdtest/Makefile.am
+++ b/c/src/tests/samples/cdtest/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SAMPLE = cdtest
 PGM = ${ARCH}/$(SAMPLE).exe
--- a/c/src/tests/samples/hello/Makefile.am
+++ b/c/src/tests/samples/hello/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SAMPLE = hello
 PGM = ${ARCH}/$(SAMPLE).exe
--- a/c/src/tests/samples/minimum/Makefile.am
+++ b/c/src/tests/samples/minimum/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SAMPLE = minimum
 PGM = ${ARCH}/$(SAMPLE).exe
--- a/c/src/tests/samples/paranoia/Makefile.am
+++ b/c/src/tests/samples/paranoia/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SAMPLE = paranoia
 PGM = ${ARCH}/$(SAMPLE).exe
--- a/c/src/tests/samples/ticker/Makefile.am
+++ b/c/src/tests/samples/ticker/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SAMPLE = ticker
 PGM = ${ARCH}/$(SAMPLE).exe
--- a/c/src/tests/samples/unlimited/Makefile.am
+++ b/c/src/tests/samples/unlimited/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SAMPLE = unlimited
 PGM = ${ARCH}/$(SAMPLE).exe
--- a/c/src/tests/sptests/sp01/Makefile.am
+++ b/c/src/tests/sptests/sp01/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp01

--- a/c/src/tests/sptests/sp02/Makefile.am
+++ b/c/src/tests/sptests/sp02/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp02

--- a/c/src/tests/sptests/sp03/Makefile.am
+++ b/c/src/tests/sptests/sp03/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp03

--- a/c/src/tests/sptests/sp04/Makefile.am
+++ b/c/src/tests/sptests/sp04/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp04

--- a/c/src/tests/sptests/sp05/Makefile.am
+++ b/c/src/tests/sptests/sp05/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp05

--- a/c/src/tests/sptests/sp06/Makefile.am
+++ b/c/src/tests/sptests/sp06/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp06

--- a/c/src/tests/sptests/sp07/Makefile.am
+++ b/c/src/tests/sptests/sp07/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp07

--- a/c/src/tests/sptests/sp08/Makefile.am
+++ b/c/src/tests/sptests/sp08/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp08

--- a/c/src/tests/sptests/sp09/Makefile.am
+++ b/c/src/tests/sptests/sp09/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp09

--- a/c/src/tests/sptests/sp11/Makefile.am
+++ b/c/src/tests/sptests/sp11/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp11

--- a/c/src/tests/sptests/sp12/Makefile.am
+++ b/c/src/tests/sptests/sp12/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp12

--- a/c/src/tests/sptests/sp13/Makefile.am
+++ b/c/src/tests/sptests/sp13/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp13

--- a/c/src/tests/sptests/sp14/Makefile.am
+++ b/c/src/tests/sptests/sp14/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp14

--- a/c/src/tests/sptests/sp15/Makefile.am
+++ b/c/src/tests/sptests/sp15/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp15

--- a/c/src/tests/sptests/sp16/Makefile.am
+++ b/c/src/tests/sptests/sp16/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp16

--- a/c/src/tests/sptests/sp17/Makefile.am
+++ b/c/src/tests/sptests/sp17/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp17

--- a/c/src/tests/sptests/sp19/Makefile.am
+++ b/c/src/tests/sptests/sp19/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp19

--- a/c/src/tests/sptests/sp20/Makefile.am
+++ b/c/src/tests/sptests/sp20/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp20

--- a/c/src/tests/sptests/sp21/Makefile.am
+++ b/c/src/tests/sptests/sp21/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp21

@@ -30,6 +29,8 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/sptests.am

+LD_LIBS += $(PROJECT_RELEASE)/lib/libtest$(LIBSUFFIX_VA)
+
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)

--- a/c/src/tests/sptests/sp22/Makefile.am
+++ b/c/src/tests/sptests/sp22/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp22

--- a/c/src/tests/sptests/sp23/Makefile.am
+++ b/c/src/tests/sptests/sp23/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp23

--- a/c/src/tests/sptests/sp24/Makefile.am
+++ b/c/src/tests/sptests/sp24/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp24

--- a/c/src/tests/sptests/sp25/Makefile.am
+++ b/c/src/tests/sptests/sp25/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp25

--- a/c/src/tests/sptests/sp26/Makefile.am
+++ b/c/src/tests/sptests/sp26/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp26

--- a/c/src/tests/sptests/sp27/Makefile.am
+++ b/c/src/tests/sptests/sp27/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp27

--- a/c/src/tests/sptests/sp28/Makefile.am
+++ b/c/src/tests/sptests/sp28/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp28

--- a/c/src/tests/sptests/spfatal/Makefile.am
+++ b/c/src/tests/sptests/spfatal/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = spfatal

--- a/c/src/tests/sptests/spsize/Makefile.am
+++ b/c/src/tests/sptests/spsize/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = size

--- a/testsuites/itrontests/Makefile.am
+++ b/testsuites/itrontests/Makefile.am
@@ -16,6 +16,5 @@ all-local: $(PREINSTALLDIRS)
 SUBDIRS = . itronhello itrontask01 itrontask02 itrontask03 itrontask04 \
    itronmbf01 itronmbox01 itronsem01 itrontime01

-
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am
--- a/testsuites/samples/base_mp/Makefile.am
+++ b/testsuites/samples/base_mp/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SUBDIRS = node1 node2

--- a/testsuites/samples/base_mp/node1/Makefile.am
+++ b/testsuites/samples/base_mp/node1/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 VPATH = @srcdir@:@srcdir@/..

--- a/testsuites/samples/base_mp/node2/Makefile.am
+++ b/testsuites/samples/base_mp/node2/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 VPATH = @srcdir@:@srcdir@/..

--- a/testsuites/samples/base_sp/Makefile.am
+++ b/testsuites/samples/base_sp/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SAMPLE = base_sp
 PGM = ${ARCH}/$(SAMPLE).exe
--- a/testsuites/samples/cdtest/Makefile.am
+++ b/testsuites/samples/cdtest/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SAMPLE = cdtest
 PGM = ${ARCH}/$(SAMPLE).exe
--- a/testsuites/samples/hello/Makefile.am
+++ b/testsuites/samples/hello/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SAMPLE = hello
 PGM = ${ARCH}/$(SAMPLE).exe
--- a/testsuites/samples/minimum/Makefile.am
+++ b/testsuites/samples/minimum/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SAMPLE = minimum
 PGM = ${ARCH}/$(SAMPLE).exe
--- a/testsuites/samples/paranoia/Makefile.am
+++ b/testsuites/samples/paranoia/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SAMPLE = paranoia
 PGM = ${ARCH}/$(SAMPLE).exe
--- a/testsuites/samples/ticker/Makefile.am
+++ b/testsuites/samples/ticker/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SAMPLE = ticker
 PGM = ${ARCH}/$(SAMPLE).exe
--- a/testsuites/samples/unlimited/Makefile.am
+++ b/testsuites/samples/unlimited/Makefile.am
@@ -3,7 +3,6 @@
 ##

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 SAMPLE = unlimited
 PGM = ${ARCH}/$(SAMPLE).exe
--- a/testsuites/sptests/sp01/Makefile.am
+++ b/testsuites/sptests/sp01/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp01

--- a/testsuites/sptests/sp02/Makefile.am
+++ b/testsuites/sptests/sp02/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp02

--- a/testsuites/sptests/sp03/Makefile.am
+++ b/testsuites/sptests/sp03/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp03

--- a/testsuites/sptests/sp04/Makefile.am
+++ b/testsuites/sptests/sp04/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp04

--- a/testsuites/sptests/sp05/Makefile.am
+++ b/testsuites/sptests/sp05/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp05

--- a/testsuites/sptests/sp06/Makefile.am
+++ b/testsuites/sptests/sp06/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp06

--- a/testsuites/sptests/sp07/Makefile.am
+++ b/testsuites/sptests/sp07/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp07

--- a/testsuites/sptests/sp08/Makefile.am
+++ b/testsuites/sptests/sp08/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp08

--- a/testsuites/sptests/sp09/Makefile.am
+++ b/testsuites/sptests/sp09/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp09

--- a/testsuites/sptests/sp11/Makefile.am
+++ b/testsuites/sptests/sp11/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp11

--- a/testsuites/sptests/sp12/Makefile.am
+++ b/testsuites/sptests/sp12/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp12

--- a/testsuites/sptests/sp13/Makefile.am
+++ b/testsuites/sptests/sp13/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp13

--- a/testsuites/sptests/sp14/Makefile.am
+++ b/testsuites/sptests/sp14/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp14

--- a/testsuites/sptests/sp15/Makefile.am
+++ b/testsuites/sptests/sp15/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp15

--- a/testsuites/sptests/sp16/Makefile.am
+++ b/testsuites/sptests/sp16/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp16

--- a/testsuites/sptests/sp17/Makefile.am
+++ b/testsuites/sptests/sp17/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp17

--- a/testsuites/sptests/sp19/Makefile.am
+++ b/testsuites/sptests/sp19/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp19

--- a/testsuites/sptests/sp20/Makefile.am
+++ b/testsuites/sptests/sp20/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp20

--- a/testsuites/sptests/sp21/Makefile.am
+++ b/testsuites/sptests/sp21/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp21

@@ -30,6 +29,8 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(RTEMS_ROOT)/make/leaf.cfg
 include $(top_srcdir)/sptests.am

+LD_LIBS += $(PROJECT_RELEASE)/lib/libtest$(LIBSUFFIX_VA)
+
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)

--- a/testsuites/sptests/sp22/Makefile.am
+++ b/testsuites/sptests/sp22/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp22

--- a/testsuites/sptests/sp23/Makefile.am
+++ b/testsuites/sptests/sp23/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp23

--- a/testsuites/sptests/sp24/Makefile.am
+++ b/testsuites/sptests/sp24/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp24

--- a/testsuites/sptests/sp25/Makefile.am
+++ b/testsuites/sptests/sp25/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp25

--- a/testsuites/sptests/sp26/Makefile.am
+++ b/testsuites/sptests/sp26/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp26

--- a/testsuites/sptests/sp27/Makefile.am
+++ b/testsuites/sptests/sp27/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp27

--- a/testsuites/sptests/sp28/Makefile.am
+++ b/testsuites/sptests/sp28/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = sp28

--- a/testsuites/sptests/spfatal/Makefile.am
+++ b/testsuites/sptests/spfatal/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = spfatal

--- a/testsuites/sptests/spsize/Makefile.am
+++ b/testsuites/sptests/spsize/Makefile.am
@@ -3,7 +3,6 @@
 ## 

 AUTOMAKE_OPTIONS = foreign 1.4
-ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal

 TEST = size