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]).
	* base_mp/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* base_mp/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* base_mp/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* Makefile.am: Remove AUTOMAKE_OPTIONS.
	* base_sp/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* cdtest/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* hello/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* minimum/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* paranoia/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* ticker/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* unlimited/Makefile.am: Remove AUTOMAKE_OPTIONS.

13 files changed, 19 insertions, 13 deletions

diff --git a/c/src/tests/samples/ChangeLog b/c/src/tests/samples/ChangeLog
index 2a686b579d..a5b732e169 100644
--- a/c/src/tests/samples/ChangeLog
+++ b/c/src/tests/samples/ChangeLog
@@ -1,3 +1,20 @@
+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]).
+	* base_mp/node1/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* base_mp/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* base_mp/node2/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* base_sp/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* cdtest/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* hello/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* minimum/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* paranoia/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* ticker/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* unlimited/Makefile.am: Remove AUTOMAKE_OPTIONS.
+
 2001-11-26	Ralf Corsepius
 
 	* cdtest/main.cc: Remove RTEMS_TEST_IO_STREAM.
diff --git a/c/src/tests/samples/Makefile.am b/c/src/tests/samples/Makefile.am
index 8e9dd21218..c94f2369ee 100644
--- a/c/src/tests/samples/Makefile.am
+++ b/c/src/tests/samples/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I ../../../../aclocal
 
 CPLUSPLUS_TESTS = cdtest
diff --git a/c/src/tests/samples/base_mp/Makefile.am b/c/src/tests/samples/base_mp/Makefile.am
index 7f17c2b0a8..77ac7b9fe2 100644
--- a/c/src/tests/samples/base_mp/Makefile.am
+++ b/c/src/tests/samples/base_mp/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 SUBDIRS = node1 node2
 
diff --git a/c/src/tests/samples/base_mp/node1/Makefile.am b/c/src/tests/samples/base_mp/node1/Makefile.am
index 85cf16f4e5..2cc006bbd2 100644
--- a/c/src/tests/samples/base_mp/node1/Makefile.am
+++ b/c/src/tests/samples/base_mp/node1/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 VPATH = @srcdir@:@srcdir@/..
 
diff --git a/c/src/tests/samples/base_mp/node2/Makefile.am b/c/src/tests/samples/base_mp/node2/Makefile.am
index 3ba7935b60..36ed59ac87 100644
--- a/c/src/tests/samples/base_mp/node2/Makefile.am
+++ b/c/src/tests/samples/base_mp/node2/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 VPATH = @srcdir@:@srcdir@/..
 
diff --git a/c/src/tests/samples/base_sp/Makefile.am b/c/src/tests/samples/base_sp/Makefile.am
index 5fa8708868..cd0e55c3e9 100644
--- a/c/src/tests/samples/base_sp/Makefile.am
+++ b/c/src/tests/samples/base_sp/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 SAMPLE = base_sp
 PGM = ${ARCH}/$(SAMPLE).exe
diff --git a/c/src/tests/samples/cdtest/Makefile.am b/c/src/tests/samples/cdtest/Makefile.am
index 4c68c3b7e5..934d2ea6e8 100644
--- a/c/src/tests/samples/cdtest/Makefile.am
+++ b/c/src/tests/samples/cdtest/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 SAMPLE = cdtest
 PGM = ${ARCH}/$(SAMPLE).exe
diff --git a/c/src/tests/samples/configure.ac b/c/src/tests/samples/configure.ac
index 42dbf2fe83..d2252957cc 100644
--- a/c/src/tests/samples/configure.ac
+++ b/c/src/tests/samples/configure.ac
@@ -3,14 +3,14 @@
 ## $Id$
 
 AC_PREREQ(2.52)
-AC_INIT
+AC_INIT([rtems-c-src-tests-samples],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([hello])
 RTEMS_TOP(../../../..)
 AC_CONFIG_AUX_DIR(../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
 
-AM_INIT_AUTOMAKE(rtems-c-src-tests-samples,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE([no-define foreign 1.6])
 AM_MAINTAINER_MODE
 
 RTEMS_ENABLE_NETWORKING
diff --git a/c/src/tests/samples/hello/Makefile.am b/c/src/tests/samples/hello/Makefile.am
index 7afd508c5e..846740c5ac 100644
--- a/c/src/tests/samples/hello/Makefile.am
+++ b/c/src/tests/samples/hello/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 SAMPLE = hello
 PGM = ${ARCH}/$(SAMPLE).exe
diff --git a/c/src/tests/samples/minimum/Makefile.am b/c/src/tests/samples/minimum/Makefile.am
index 971ea9eaf7..3ff74a0b01 100644
--- a/c/src/tests/samples/minimum/Makefile.am
+++ b/c/src/tests/samples/minimum/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 SAMPLE = minimum
 PGM = ${ARCH}/$(SAMPLE).exe
diff --git a/c/src/tests/samples/paranoia/Makefile.am b/c/src/tests/samples/paranoia/Makefile.am
index 075bcfd5ab..d158eba254 100644
--- a/c/src/tests/samples/paranoia/Makefile.am
+++ b/c/src/tests/samples/paranoia/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 SAMPLE = paranoia
 PGM = ${ARCH}/$(SAMPLE).exe
diff --git a/c/src/tests/samples/ticker/Makefile.am b/c/src/tests/samples/ticker/Makefile.am
index 2eab38b813..16ffe4ee4e 100644
--- a/c/src/tests/samples/ticker/Makefile.am
+++ b/c/src/tests/samples/ticker/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 SAMPLE = ticker
 PGM = ${ARCH}/$(SAMPLE).exe
diff --git a/c/src/tests/samples/unlimited/Makefile.am b/c/src/tests/samples/unlimited/Makefile.am
index 31a5a182ce..78b0031173 100644
--- a/c/src/tests/samples/unlimited/Makefile.am
+++ b/c/src/tests/samples/unlimited/Makefile.am
@@ -2,7 +2,6 @@
 ##  $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 SAMPLE = unlimited
 PGM = ${ARCH}/$(SAMPLE).exe