summaryrefslogtreecommitdiffstats
path: root/testsuites
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2002-03-28 00:44:13 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2002-03-28 00:44:13 +0000
commited794ad779e76d39e64f1e8dd0620dc6c89cc317 (patch)
treeda752cf1bcbd784443282af5498b01110c807ffb /testsuites
parent8b695b93da97c3b87c403918f8143733b2f109b5 (diff)
downloadrtems-ed794ad779e76d39e64f1e8dd0620dc6c89cc317.tar.bz2
2002-03-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: AC_INIT(package,_RTEMS_VERSION,_RTEMS_BUGS). AM_INIT_AUTOMAKE([no-define foreign 1.6]). * mp01/node1/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp01/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp01/node2/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp02/node1/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp02/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp02/node2/Makefile.am: Remove AUTOMAKE_OPTIONS. * Makefile.am: Remove AUTOMAKE_OPTIONS. * mp03/node1/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp03/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp03/node2/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp04/node1/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp04/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp04/node2/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp05/node1/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp05/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp05/node2/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp06/node1/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp06/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp06/node2/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp07/node1/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp07/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp07/node2/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp08/node1/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp08/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp08/node2/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp09/node1/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp09/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp09/node2/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp10/node1/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp10/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp10/node2/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp11/node1/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp11/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp11/node2/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp12/node1/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp12/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp12/node2/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp13/node1/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp13/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp13/node2/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp14/node1/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp14/Makefile.am: Remove AUTOMAKE_OPTIONS. * mp14/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
Diffstat (limited to 'testsuites')
-rw-r--r--testsuites/mptests/ChangeLog49
-rw-r--r--testsuites/mptests/Makefile.am1
-rw-r--r--testsuites/mptests/configure.ac4
-rw-r--r--testsuites/mptests/mp01/Makefile.am1
-rw-r--r--testsuites/mptests/mp01/node1/Makefile.am1
-rw-r--r--testsuites/mptests/mp01/node2/Makefile.am1
-rw-r--r--testsuites/mptests/mp02/Makefile.am1
-rw-r--r--testsuites/mptests/mp02/node1/Makefile.am1
-rw-r--r--testsuites/mptests/mp02/node2/Makefile.am1
-rw-r--r--testsuites/mptests/mp03/Makefile.am1
-rw-r--r--testsuites/mptests/mp03/node1/Makefile.am1
-rw-r--r--testsuites/mptests/mp03/node2/Makefile.am1
-rw-r--r--testsuites/mptests/mp04/Makefile.am1
-rw-r--r--testsuites/mptests/mp04/node1/Makefile.am1
-rw-r--r--testsuites/mptests/mp04/node2/Makefile.am1
-rw-r--r--testsuites/mptests/mp05/Makefile.am1
-rw-r--r--testsuites/mptests/mp05/node1/Makefile.am1
-rw-r--r--testsuites/mptests/mp05/node2/Makefile.am1
-rw-r--r--testsuites/mptests/mp06/Makefile.am1
-rw-r--r--testsuites/mptests/mp06/node1/Makefile.am1
-rw-r--r--testsuites/mptests/mp06/node2/Makefile.am1
-rw-r--r--testsuites/mptests/mp07/Makefile.am1
-rw-r--r--testsuites/mptests/mp07/node1/Makefile.am1
-rw-r--r--testsuites/mptests/mp07/node2/Makefile.am1
-rw-r--r--testsuites/mptests/mp08/Makefile.am1
-rw-r--r--testsuites/mptests/mp08/node1/Makefile.am1
-rw-r--r--testsuites/mptests/mp08/node2/Makefile.am1
-rw-r--r--testsuites/mptests/mp09/Makefile.am1
-rw-r--r--testsuites/mptests/mp09/node1/Makefile.am1
-rw-r--r--testsuites/mptests/mp09/node2/Makefile.am1
-rw-r--r--testsuites/mptests/mp10/Makefile.am1
-rw-r--r--testsuites/mptests/mp10/node1/Makefile.am1
-rw-r--r--testsuites/mptests/mp10/node2/Makefile.am1
-rw-r--r--testsuites/mptests/mp11/Makefile.am1
-rw-r--r--testsuites/mptests/mp11/node1/Makefile.am1
-rw-r--r--testsuites/mptests/mp11/node2/Makefile.am1
-rw-r--r--testsuites/mptests/mp12/Makefile.am1
-rw-r--r--testsuites/mptests/mp12/node1/Makefile.am1
-rw-r--r--testsuites/mptests/mp12/node2/Makefile.am1
-rw-r--r--testsuites/mptests/mp13/Makefile.am1
-rw-r--r--testsuites/mptests/mp13/node1/Makefile.am1
-rw-r--r--testsuites/mptests/mp13/node2/Makefile.am1
-rw-r--r--testsuites/mptests/mp14/Makefile.am1
-rw-r--r--testsuites/mptests/mp14/node1/Makefile.am1
-rw-r--r--testsuites/mptests/mp14/node2/Makefile.am1
45 files changed, 51 insertions, 45 deletions
diff --git a/testsuites/mptests/ChangeLog b/testsuites/mptests/ChangeLog
index 9767ce8e7c..6543896759 100644
--- a/testsuites/mptests/ChangeLog
+++ b/testsuites/mptests/ChangeLog
@@ -1,3 +1,52 @@
+2002-03-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac:
+ AC_INIT(package,_RTEMS_VERSION,_RTEMS_BUGS).
+ AM_INIT_AUTOMAKE([no-define foreign 1.6]).
+ * mp01/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp01/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp01/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp02/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp02/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp02/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp03/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp03/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp03/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp04/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp04/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp04/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp05/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp05/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp05/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp06/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp06/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp06/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp07/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp07/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp07/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp08/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp08/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp08/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp09/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp09/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp09/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp10/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp10/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp10/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp11/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp11/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp11/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp12/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp12/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp12/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp13/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp13/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp13/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp14/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp14/Makefile.am: Remove AUTOMAKE_OPTIONS.
+ * mp14/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
+
2001-11-07 Joel Sherrill <joel@OARcorp.com>
Tracked as PR72 but related to the object id problem (PR36)
diff --git a/testsuites/mptests/Makefile.am b/testsuites/mptests/Makefile.am
index fe5fbe8e99..a3aeb6930e 100644
--- a/testsuites/mptests/Makefile.am
+++ b/testsuites/mptests/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I ../../../../aclocal
SUBDIRS = mp01 mp02 mp03 mp04 mp05 mp06 mp07 mp08 mp09 mp10 mp11 mp12 mp13 \
diff --git a/testsuites/mptests/configure.ac b/testsuites/mptests/configure.ac
index 54af2cf85f..ca53682f30 100644
--- a/testsuites/mptests/configure.ac
+++ b/testsuites/mptests/configure.ac
@@ -3,14 +3,14 @@
## $Id$
AC_PREREQ(2.52)
-AC_INIT
+AC_INIT([rtems-c-src-tests-mptests],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
AC_CONFIG_SRCDIR([mp01])
RTEMS_TOP(../../../..)
AC_CONFIG_AUX_DIR(../../../..)
RTEMS_CANONICAL_TARGET_CPU
-AM_INIT_AUTOMAKE(rtems-c-src-tests-mptests,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE([no-define foreign 1.6])
AM_MAINTAINER_MODE
RTEMS_ENABLE_GCC28
diff --git a/testsuites/mptests/mp01/Makefile.am b/testsuites/mptests/mp01/Makefile.am
index cdae39f815..258666c691 100644
--- a/testsuites/mptests/mp01/Makefile.am
+++ b/testsuites/mptests/mp01/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = node1 node2
diff --git a/testsuites/mptests/mp01/node1/Makefile.am b/testsuites/mptests/mp01/node1/Makefile.am
index b137d8afce..4225fc5e23 100644
--- a/testsuites/mptests/mp01/node1/Makefile.am
+++ b/testsuites/mptests/mp01/node1/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp01/node2/Makefile.am b/testsuites/mptests/mp01/node2/Makefile.am
index 048cabd609..16b2a27d41 100644
--- a/testsuites/mptests/mp01/node2/Makefile.am
+++ b/testsuites/mptests/mp01/node2/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp02/Makefile.am b/testsuites/mptests/mp02/Makefile.am
index cdae39f815..258666c691 100644
--- a/testsuites/mptests/mp02/Makefile.am
+++ b/testsuites/mptests/mp02/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = node1 node2
diff --git a/testsuites/mptests/mp02/node1/Makefile.am b/testsuites/mptests/mp02/node1/Makefile.am
index d64784ed25..8876dae1a8 100644
--- a/testsuites/mptests/mp02/node1/Makefile.am
+++ b/testsuites/mptests/mp02/node1/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp02/node2/Makefile.am b/testsuites/mptests/mp02/node2/Makefile.am
index 3515afdc7e..ee04e3b30c 100644
--- a/testsuites/mptests/mp02/node2/Makefile.am
+++ b/testsuites/mptests/mp02/node2/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp03/Makefile.am b/testsuites/mptests/mp03/Makefile.am
index c467df661d..96df97c368 100644
--- a/testsuites/mptests/mp03/Makefile.am
+++ b/testsuites/mptests/mp03/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = node1 node2
diff --git a/testsuites/mptests/mp03/node1/Makefile.am b/testsuites/mptests/mp03/node1/Makefile.am
index d61ae8e765..7a8668fa9d 100644
--- a/testsuites/mptests/mp03/node1/Makefile.am
+++ b/testsuites/mptests/mp03/node1/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp03/node2/Makefile.am b/testsuites/mptests/mp03/node2/Makefile.am
index 4aa97a6d09..d38393b4b7 100644
--- a/testsuites/mptests/mp03/node2/Makefile.am
+++ b/testsuites/mptests/mp03/node2/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp04/Makefile.am b/testsuites/mptests/mp04/Makefile.am
index cdae39f815..258666c691 100644
--- a/testsuites/mptests/mp04/Makefile.am
+++ b/testsuites/mptests/mp04/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = node1 node2
diff --git a/testsuites/mptests/mp04/node1/Makefile.am b/testsuites/mptests/mp04/node1/Makefile.am
index 147876c2c1..89d4a55f1d 100644
--- a/testsuites/mptests/mp04/node1/Makefile.am
+++ b/testsuites/mptests/mp04/node1/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp04/node2/Makefile.am b/testsuites/mptests/mp04/node2/Makefile.am
index 04b4cf644d..63f4185243 100644
--- a/testsuites/mptests/mp04/node2/Makefile.am
+++ b/testsuites/mptests/mp04/node2/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp05/Makefile.am b/testsuites/mptests/mp05/Makefile.am
index 27564a9335..3aef092e1a 100644
--- a/testsuites/mptests/mp05/Makefile.am
+++ b/testsuites/mptests/mp05/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = node1 node2
diff --git a/testsuites/mptests/mp05/node1/Makefile.am b/testsuites/mptests/mp05/node1/Makefile.am
index 9302b4f423..c5e3d21b76 100644
--- a/testsuites/mptests/mp05/node1/Makefile.am
+++ b/testsuites/mptests/mp05/node1/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp05/node2/Makefile.am b/testsuites/mptests/mp05/node2/Makefile.am
index b025bd665f..575b0f7b73 100644
--- a/testsuites/mptests/mp05/node2/Makefile.am
+++ b/testsuites/mptests/mp05/node2/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp06/Makefile.am b/testsuites/mptests/mp06/Makefile.am
index cdae39f815..258666c691 100644
--- a/testsuites/mptests/mp06/Makefile.am
+++ b/testsuites/mptests/mp06/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = node1 node2
diff --git a/testsuites/mptests/mp06/node1/Makefile.am b/testsuites/mptests/mp06/node1/Makefile.am
index 11b70fbb45..11089a8012 100644
--- a/testsuites/mptests/mp06/node1/Makefile.am
+++ b/testsuites/mptests/mp06/node1/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp06/node2/Makefile.am b/testsuites/mptests/mp06/node2/Makefile.am
index e216c518a7..6de6545dec 100644
--- a/testsuites/mptests/mp06/node2/Makefile.am
+++ b/testsuites/mptests/mp06/node2/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp07/Makefile.am b/testsuites/mptests/mp07/Makefile.am
index cdae39f815..258666c691 100644
--- a/testsuites/mptests/mp07/Makefile.am
+++ b/testsuites/mptests/mp07/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = node1 node2
diff --git a/testsuites/mptests/mp07/node1/Makefile.am b/testsuites/mptests/mp07/node1/Makefile.am
index 275b3fe520..75b52335cc 100644
--- a/testsuites/mptests/mp07/node1/Makefile.am
+++ b/testsuites/mptests/mp07/node1/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp07/node2/Makefile.am b/testsuites/mptests/mp07/node2/Makefile.am
index 50e4979229..749c0bb330 100644
--- a/testsuites/mptests/mp07/node2/Makefile.am
+++ b/testsuites/mptests/mp07/node2/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp08/Makefile.am b/testsuites/mptests/mp08/Makefile.am
index cdae39f815..258666c691 100644
--- a/testsuites/mptests/mp08/Makefile.am
+++ b/testsuites/mptests/mp08/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = node1 node2
diff --git a/testsuites/mptests/mp08/node1/Makefile.am b/testsuites/mptests/mp08/node1/Makefile.am
index f09c2bd5e3..7903247238 100644
--- a/testsuites/mptests/mp08/node1/Makefile.am
+++ b/testsuites/mptests/mp08/node1/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp08/node2/Makefile.am b/testsuites/mptests/mp08/node2/Makefile.am
index 904ab27875..decd2eaa86 100644
--- a/testsuites/mptests/mp08/node2/Makefile.am
+++ b/testsuites/mptests/mp08/node2/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp09/Makefile.am b/testsuites/mptests/mp09/Makefile.am
index f15aa15612..c1aa92d6e4 100644
--- a/testsuites/mptests/mp09/Makefile.am
+++ b/testsuites/mptests/mp09/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = node1 node2
diff --git a/testsuites/mptests/mp09/node1/Makefile.am b/testsuites/mptests/mp09/node1/Makefile.am
index 7829c6a636..50d256a0cb 100644
--- a/testsuites/mptests/mp09/node1/Makefile.am
+++ b/testsuites/mptests/mp09/node1/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp09/node2/Makefile.am b/testsuites/mptests/mp09/node2/Makefile.am
index 79f9642da8..03cd85a211 100644
--- a/testsuites/mptests/mp09/node2/Makefile.am
+++ b/testsuites/mptests/mp09/node2/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp10/Makefile.am b/testsuites/mptests/mp10/Makefile.am
index 5ccb6eac78..582e16526b 100644
--- a/testsuites/mptests/mp10/Makefile.am
+++ b/testsuites/mptests/mp10/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = node1 node2
diff --git a/testsuites/mptests/mp10/node1/Makefile.am b/testsuites/mptests/mp10/node1/Makefile.am
index 0a9ce0e0fa..33deeb77cd 100644
--- a/testsuites/mptests/mp10/node1/Makefile.am
+++ b/testsuites/mptests/mp10/node1/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp10/node2/Makefile.am b/testsuites/mptests/mp10/node2/Makefile.am
index 83dcdd7b5c..6c3108d14d 100644
--- a/testsuites/mptests/mp10/node2/Makefile.am
+++ b/testsuites/mptests/mp10/node2/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp11/Makefile.am b/testsuites/mptests/mp11/Makefile.am
index b911e9c09c..0c8115305b 100644
--- a/testsuites/mptests/mp11/Makefile.am
+++ b/testsuites/mptests/mp11/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = node1 node2
diff --git a/testsuites/mptests/mp11/node1/Makefile.am b/testsuites/mptests/mp11/node1/Makefile.am
index 08556128fe..d7bbf27a22 100644
--- a/testsuites/mptests/mp11/node1/Makefile.am
+++ b/testsuites/mptests/mp11/node1/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp11/node2/Makefile.am b/testsuites/mptests/mp11/node2/Makefile.am
index 76ad10bdca..9db2320754 100644
--- a/testsuites/mptests/mp11/node2/Makefile.am
+++ b/testsuites/mptests/mp11/node2/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp12/Makefile.am b/testsuites/mptests/mp12/Makefile.am
index b911e9c09c..0c8115305b 100644
--- a/testsuites/mptests/mp12/Makefile.am
+++ b/testsuites/mptests/mp12/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = node1 node2
diff --git a/testsuites/mptests/mp12/node1/Makefile.am b/testsuites/mptests/mp12/node1/Makefile.am
index 2cdde2d443..54dc4aa00a 100644
--- a/testsuites/mptests/mp12/node1/Makefile.am
+++ b/testsuites/mptests/mp12/node1/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp12/node2/Makefile.am b/testsuites/mptests/mp12/node2/Makefile.am
index b0459c0c40..aa133f9d55 100644
--- a/testsuites/mptests/mp12/node2/Makefile.am
+++ b/testsuites/mptests/mp12/node2/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp13/Makefile.am b/testsuites/mptests/mp13/Makefile.am
index 7d4d002d1c..d235c7e518 100644
--- a/testsuites/mptests/mp13/Makefile.am
+++ b/testsuites/mptests/mp13/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = node1 node2
diff --git a/testsuites/mptests/mp13/node1/Makefile.am b/testsuites/mptests/mp13/node1/Makefile.am
index e120ecc443..efbea78c40 100644
--- a/testsuites/mptests/mp13/node1/Makefile.am
+++ b/testsuites/mptests/mp13/node1/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp13/node2/Makefile.am b/testsuites/mptests/mp13/node2/Makefile.am
index 7edba85864..425beaca5b 100644
--- a/testsuites/mptests/mp13/node2/Makefile.am
+++ b/testsuites/mptests/mp13/node2/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp14/Makefile.am b/testsuites/mptests/mp14/Makefile.am
index 2a2950ef0e..2b98c578e8 100644
--- a/testsuites/mptests/mp14/Makefile.am
+++ b/testsuites/mptests/mp14/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
SUBDIRS = node1 node2
diff --git a/testsuites/mptests/mp14/node1/Makefile.am b/testsuites/mptests/mp14/node1/Makefile.am
index cc0acdcf7c..5d3e0991b5 100644
--- a/testsuites/mptests/mp14/node1/Makefile.am
+++ b/testsuites/mptests/mp14/node1/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..
diff --git a/testsuites/mptests/mp14/node2/Makefile.am b/testsuites/mptests/mp14/node2/Makefile.am
index 71438a7e71..af35f20647 100644
--- a/testsuites/mptests/mp14/node2/Makefile.am
+++ b/testsuites/mptests/mp14/node2/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-AUTOMAKE_OPTIONS = foreign 1.4
VPATH = @srcdir@:@srcdir@/..