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]).
	* clock/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* Makefile.am: Remove AUTOMAKE_OPTIONS.
	* console/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* include/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* spurious/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* start/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* startup/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* timer/Makefile.am: Remove AUTOMAKE_OPTIONS.
	* wrapup/Makefile.am: Remove AUTOMAKE_OPTIONS.

11 files changed, 17 insertions, 11 deletions

diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
index e11a955e63..78c708e4ae 100644
--- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog
@@ -1,3 +1,18 @@
+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]).
+	* clock/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* console/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* include/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* spurious/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* start/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* startup/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* timer/Makefile.am: Remove AUTOMAKE_OPTIONS.
+	* wrapup/Makefile.am: Remove AUTOMAKE_OPTIONS.
+
 2002-02-28	Mike Panetta <ahuitzot@mindspring.com>
 
 	* console/sci.c, console/sci.h, 
diff --git a/c/src/lib/libbsp/m68k/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
index 02af1cbb18..21416746b5 100644
--- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
 # wrapup is the one that actually builds and installs the library
diff --git a/c/src/lib/libbsp/m68k/mrm332/clock/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/clock/Makefile.am
index bb7f99ff8d..9971dae61c 100644
--- a/c/src/lib/libbsp/m68k/mrm332/clock/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/clock/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 PGM = $(ARCH)/clock.rel
 
diff --git a/c/src/lib/libbsp/m68k/mrm332/configure.ac b/c/src/lib/libbsp/m68k/mrm332/configure.ac
index f7f9666c8f..a193efee8a 100644
--- a/c/src/lib/libbsp/m68k/mrm332/configure.ac
+++ b/c/src/lib/libbsp/m68k/mrm332/configure.ac
@@ -3,13 +3,13 @@
 ## $Id$
 
 AC_PREREQ(2.52)
-AC_INIT
+AC_INIT([rtems-c-src-lib-libbsp-m68k-mrm332],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
 AC_CONFIG_SRCDIR([bsp_specs])
 RTEMS_TOP(../../../../../..)
 AC_CONFIG_AUX_DIR(../../../../../..)
 
 RTEMS_CANONICAL_TARGET_CPU
-AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-m68k-mrm,$RTEMS_VERSION,no)
+AM_INIT_AUTOMAKE([no-define foreign 1.6])
 RTEMS_BSP_CONFIGURE
 
 RTEMS_PROG_CC_FOR_TARGET
diff --git a/c/src/lib/libbsp/m68k/mrm332/console/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/console/Makefile.am
index 9d67d681fb..752ac2ffda 100644
--- a/c/src/lib/libbsp/m68k/mrm332/console/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/console/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 PGM = $(ARCH)/console.rel
 
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/include/Makefile.am
index 4edf39fd33..b877aca89b 100644
--- a/c/src/lib/libbsp/m68k/mrm332/include/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/include/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 include_HEADERS = bsp.h coverhd.h mrm332.h bspopts.h
 
diff --git a/c/src/lib/libbsp/m68k/mrm332/spurious/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/spurious/Makefile.am
index 7e27ca5ee3..df4e147413 100644
--- a/c/src/lib/libbsp/m68k/mrm332/spurious/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/spurious/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 PGM = $(ARCH)/spurious.rel
 
diff --git a/c/src/lib/libbsp/m68k/mrm332/start/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/start/Makefile.am
index 86053b9e99..c80db2c2c8 100644
--- a/c/src/lib/libbsp/m68k/mrm332/start/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/start/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 PGM = $(ARCH)/start.o
 
diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am
index 61e3b8bffa..9c033ec88e 100644
--- a/c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
 
diff --git a/c/src/lib/libbsp/m68k/mrm332/timer/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/timer/Makefile.am
index 53b53ebc99..7ee76eb7cc 100644
--- a/c/src/lib/libbsp/m68k/mrm332/timer/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/timer/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 PGM = $(ARCH)/timer.rel
 
diff --git a/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am
index b4b6aa3349..85c55e066d 100644
--- a/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
 
 BSP_PIECES = startup clock console spurious timer