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

to fix some minor bugs in the conversion to automake.

39 files changed, 2 insertions, 39 deletions

diff --git a/testsuites/itrontests/Makefile.am b/testsuites/itrontests/Makefile.am
index d741bc7b47..359cf6be50 100644
--- 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
diff --git a/testsuites/samples/base_mp/Makefile.am b/testsuites/samples/base_mp/Makefile.am
index 932e671355..7f17c2b0a8 100644
--- 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
 
diff --git a/testsuites/samples/base_mp/node1/Makefile.am b/testsuites/samples/base_mp/node1/Makefile.am
index 3dcfaf1c13..6ef095fbaa 100644
--- 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@/..
 
diff --git a/testsuites/samples/base_mp/node2/Makefile.am b/testsuites/samples/base_mp/node2/Makefile.am
index 8c9ca81f62..9473b08070 100644
--- 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@/..
 
diff --git a/testsuites/samples/base_sp/Makefile.am b/testsuites/samples/base_sp/Makefile.am
index 488642e8d9..2155c68fd0 100644
--- 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
diff --git a/testsuites/samples/cdtest/Makefile.am b/testsuites/samples/cdtest/Makefile.am
index 63df0ec728..d9af49e01f 100644
--- 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
diff --git a/testsuites/samples/hello/Makefile.am b/testsuites/samples/hello/Makefile.am
index 9f78e2df38..58b25a9ede 100644
--- 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
diff --git a/testsuites/samples/minimum/Makefile.am b/testsuites/samples/minimum/Makefile.am
index 96a9bd4901..64e1f3e307 100644
--- 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
diff --git a/testsuites/samples/paranoia/Makefile.am b/testsuites/samples/paranoia/Makefile.am
index 6d828ad594..e58d783a66 100644
--- 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
diff --git a/testsuites/samples/ticker/Makefile.am b/testsuites/samples/ticker/Makefile.am
index 7af7c81524..f2980aa672 100644
--- 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
diff --git a/testsuites/samples/unlimited/Makefile.am b/testsuites/samples/unlimited/Makefile.am
index aaa9bb0b2e..1cb2e530ea 100644
--- 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
diff --git a/testsuites/sptests/sp01/Makefile.am b/testsuites/sptests/sp01/Makefile.am
index bd49c6c0cc..9c3a9943ea 100644
--- 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
 
diff --git a/testsuites/sptests/sp02/Makefile.am b/testsuites/sptests/sp02/Makefile.am
index fcbcb7864f..8e49ab9045 100644
--- 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
 
diff --git a/testsuites/sptests/sp03/Makefile.am b/testsuites/sptests/sp03/Makefile.am
index 530ca24203..5390b33c68 100644
--- 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
 
diff --git a/testsuites/sptests/sp04/Makefile.am b/testsuites/sptests/sp04/Makefile.am
index 8b92ea9b60..6a4d8d7996 100644
--- 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
 
diff --git a/testsuites/sptests/sp05/Makefile.am b/testsuites/sptests/sp05/Makefile.am
index ac67a3a429..ad82065c79 100644
--- 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
 
diff --git a/testsuites/sptests/sp06/Makefile.am b/testsuites/sptests/sp06/Makefile.am
index 2d4dbe3303..ec15d7be08 100644
--- 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
 
diff --git a/testsuites/sptests/sp07/Makefile.am b/testsuites/sptests/sp07/Makefile.am
index 8e3037b1dc..c1972ff862 100644
--- 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
 
diff --git a/testsuites/sptests/sp08/Makefile.am b/testsuites/sptests/sp08/Makefile.am
index 44b255c4b6..1ad558f50f 100644
--- 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
 
diff --git a/testsuites/sptests/sp09/Makefile.am b/testsuites/sptests/sp09/Makefile.am
index 16de8bb7ba..5265904188 100644
--- 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
 
diff --git a/testsuites/sptests/sp11/Makefile.am b/testsuites/sptests/sp11/Makefile.am
index 9be244a2eb..102dd45e77 100644
--- 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
 
diff --git a/testsuites/sptests/sp12/Makefile.am b/testsuites/sptests/sp12/Makefile.am
index 46472ad649..c390f01de8 100644
--- 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
 
diff --git a/testsuites/sptests/sp13/Makefile.am b/testsuites/sptests/sp13/Makefile.am
index 42175754cb..0760d48fea 100644
--- 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
 
diff --git a/testsuites/sptests/sp14/Makefile.am b/testsuites/sptests/sp14/Makefile.am
index 96bc60f2c5..b16ff90379 100644
--- 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
 
diff --git a/testsuites/sptests/sp15/Makefile.am b/testsuites/sptests/sp15/Makefile.am
index 9e659e093b..57812f52d2 100644
--- 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
 
diff --git a/testsuites/sptests/sp16/Makefile.am b/testsuites/sptests/sp16/Makefile.am
index aa7a841be3..9b6c226917 100644
--- 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
 
diff --git a/testsuites/sptests/sp17/Makefile.am b/testsuites/sptests/sp17/Makefile.am
index 0d14ed9c73..2690cd7964 100644
--- 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
 
diff --git a/testsuites/sptests/sp19/Makefile.am b/testsuites/sptests/sp19/Makefile.am
index 7797c18b52..28168f2696 100644
--- 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
 
diff --git a/testsuites/sptests/sp20/Makefile.am b/testsuites/sptests/sp20/Makefile.am
index 471f247075..5b5ee077d1 100644
--- 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
 
diff --git a/testsuites/sptests/sp21/Makefile.am b/testsuites/sptests/sp21/Makefile.am
index e5bb08c143..649c29c785 100644
--- 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)
 
diff --git a/testsuites/sptests/sp22/Makefile.am b/testsuites/sptests/sp22/Makefile.am
index 9481bb89d1..d955f133c5 100644
--- 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
 
diff --git a/testsuites/sptests/sp23/Makefile.am b/testsuites/sptests/sp23/Makefile.am
index 1ca83ebc45..ffec58be68 100644
--- 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
 
diff --git a/testsuites/sptests/sp24/Makefile.am b/testsuites/sptests/sp24/Makefile.am
index eeba3b7c21..783732cb03 100644
--- 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
 
diff --git a/testsuites/sptests/sp25/Makefile.am b/testsuites/sptests/sp25/Makefile.am
index ac34299e38..f643b28e4e 100644
--- 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
 
diff --git a/testsuites/sptests/sp26/Makefile.am b/testsuites/sptests/sp26/Makefile.am
index 0085e1684e..53b922728c 100644
--- 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
 
diff --git a/testsuites/sptests/sp27/Makefile.am b/testsuites/sptests/sp27/Makefile.am
index c1ff9bde9a..f595d1d53e 100644
--- 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
 
diff --git a/testsuites/sptests/sp28/Makefile.am b/testsuites/sptests/sp28/Makefile.am
index 9b441fecc8..c7841a87db 100644
--- 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
 
diff --git a/testsuites/sptests/spfatal/Makefile.am b/testsuites/sptests/spfatal/Makefile.am
index 2ad11c6f8f..39b594f951 100644
--- 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
 
diff --git a/testsuites/sptests/spsize/Makefile.am b/testsuites/sptests/spsize/Makefile.am
index c3457a5084..f9c069dcfc 100644
--- 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