2004-04-06 Ralf Corsepius <ralf_corsepius@rtems.org>

	* configure.ac: Remove (Merged into$(top_srcdir)/configure.ac).
	* Makefile.am: Don't include multilib.am.
	Reflect merging configure.ac into $(top_srcdir)/configure.ac.

12 files changed, 32 insertions, 123 deletions

diff --git a/cpukit/score/cpu/no_cpu/ChangeLog b/cpukit/score/cpu/no_cpu/ChangeLog
index effa726dde..73950edf36 100644
--- a/cpukit/score/cpu/no_cpu/ChangeLog
+++ b/cpukit/score/cpu/no_cpu/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-06	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* configure.ac: Remove (Merged into$(top_srcdir)/configure.ac).
+	* Makefile.am: Don't include multilib.am.
+	Reflect merging configure.ac into $(top_srcdir)/configure.ac.
+
 2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* Makefile.am: Install asm.h to $(includedir)/rtems.
diff --git a/cpukit/score/cpu/no_cpu/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am
index 777c1c8302..ef22e75798 100644
--- a/cpukit/score/cpu/no_cpu/Makefile.am
+++ b/cpukit/score/cpu/no_cpu/Makefile.am
@@ -2,10 +2,7 @@
 ## $Id$
 ##
 
-ACLOCAL_AMFLAGS = -I ../../../aclocal
-
-include $(top_srcdir)/../../../automake/multilib.am
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/automake/compile.am
 
 include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS = asm.h
@@ -62,4 +59,4 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
 CLEANFILES += $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/score/cpu/no_cpu/configure.ac b/cpukit/score/cpu/no_cpu/configure.ac
deleted file mode 100644
index f624ace054..0000000000
--- a/cpukit/score/cpu/no_cpu/configure.ac
+++ /dev/null
@@ -1,26 +0,0 @@
-## Process this file with autoconf to produce a configure script.
-## 
-## $Id$
-
-AC_PREREQ(2.59)
-AC_INIT([rtems-cpukit-score-cpu-no_cpu],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
-AC_CONFIG_SRCDIR([cpu_asm.c])
-RTEMS_TOP([../../../..])
-
-RTEMS_CANONICAL_TARGET_CPU
-
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.8.1])
-AM_MAINTAINER_MODE
-
-RTEMS_ENV_RTEMSCPU
-
-RTEMS_PROG_CC_FOR_TARGET
-RTEMS_PROG_CCAS
-RTEMS_CANONICALIZE_TOOLS
-AC_PROG_RANLIB
-
-RTEMS_CHECK_NEWLIB
-
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/cpukit/score/cpu/or32/ChangeLog b/cpukit/score/cpu/or32/ChangeLog
index d8b27a1b46..ada0f77fae 100644
--- a/cpukit/score/cpu/or32/ChangeLog
+++ b/cpukit/score/cpu/or32/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-06	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* configure.ac: Remove (Merged into$(top_srcdir)/configure.ac).
+	* Makefile.am: Don't include multilib.am.
+	Reflect merging configure.ac into $(top_srcdir)/configure.ac.
+
 2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* Makefile.am: Install asm.h to $(includedir)/rtems.
diff --git a/cpukit/score/cpu/or32/Makefile.am b/cpukit/score/cpu/or32/Makefile.am
index 8e50ae5274..404c57e564 100644
--- a/cpukit/score/cpu/or32/Makefile.am
+++ b/cpukit/score/cpu/or32/Makefile.am
@@ -2,10 +2,7 @@
 ## $Id$
 ##
 
-ACLOCAL_AMFLAGS = -I ../../../aclocal
-
-include $(top_srcdir)/../../../automake/multilib.am
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/automake/compile.am
 
 include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS= asm.h
@@ -62,4 +59,4 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
 CLEANFILES += $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/score/cpu/or32/configure.ac b/cpukit/score/cpu/or32/configure.ac
deleted file mode 100644
index 0062cb254d..0000000000
--- a/cpukit/score/cpu/or32/configure.ac
+++ /dev/null
@@ -1,26 +0,0 @@
-## Process this file with autoconf to produce a configure script.
-## 
-## $Id$
-
-AC_PREREQ(2.59)
-AC_INIT([rtems-cpukit-score-cpu-or32],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
-AC_CONFIG_SRCDIR([cpu_asm.c])
-RTEMS_TOP([../../../..])
-
-RTEMS_CANONICAL_TARGET_CPU
-
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.8.1])
-AM_MAINTAINER_MODE
-
-RTEMS_ENV_RTEMSCPU
-
-RTEMS_PROG_CC_FOR_TARGET
-RTEMS_PROG_CCAS
-RTEMS_CANONICALIZE_TOOLS
-AC_PROG_RANLIB
-
-RTEMS_CHECK_NEWLIB
-
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/cpukit/score/cpu/sh/ChangeLog b/cpukit/score/cpu/sh/ChangeLog
index 34942b0e54..fb46590955 100644
--- a/cpukit/score/cpu/sh/ChangeLog
+++ b/cpukit/score/cpu/sh/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-06	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* configure.ac: Remove (Merged into$(top_srcdir)/configure.ac).
+	* Makefile.am: Don't include multilib.am.
+	Reflect merging configure.ac into $(top_srcdir)/configure.ac.
+
 2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* Makefile.am: Install asm.h to $(includedir)/rtems.
diff --git a/cpukit/score/cpu/sh/Makefile.am b/cpukit/score/cpu/sh/Makefile.am
index 4f99870af7..004c0d9878 100644
--- a/cpukit/score/cpu/sh/Makefile.am
+++ b/cpukit/score/cpu/sh/Makefile.am
@@ -2,10 +2,7 @@
 ## $Id$
 ##
 
-ACLOCAL_AMFLAGS = -I ../../../aclocal
-
-include $(top_srcdir)/../../../automake/multilib.am
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/automake/compile.am
 
 include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS= asm.h
@@ -62,4 +59,4 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh_io.h
 CLEANFILES += $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/score/cpu/sh/configure.ac b/cpukit/score/cpu/sh/configure.ac
deleted file mode 100644
index 7ff5a10981..0000000000
--- a/cpukit/score/cpu/sh/configure.ac
+++ /dev/null
@@ -1,26 +0,0 @@
-## Process this file with autoconf to produce a configure script.
-## 
-## $Id$
-
-AC_PREREQ(2.59)
-AC_INIT([rtems-cpukit-score-cpu-sh],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
-AC_CONFIG_SRCDIR([asm.h])
-RTEMS_TOP([../../../..])
-
-RTEMS_CANONICAL_TARGET_CPU
-
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.8.1])
-AM_MAINTAINER_MODE
-
-RTEMS_ENV_RTEMSCPU
-
-RTEMS_PROG_CC_FOR_TARGET
-RTEMS_PROG_CCAS
-RTEMS_CANONICALIZE_TOOLS
-AC_PROG_RANLIB
-
-RTEMS_CHECK_NEWLIB
-
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
diff --git a/cpukit/score/cpu/sparc/ChangeLog b/cpukit/score/cpu/sparc/ChangeLog
index 849c3c41f5..fc376d7d3e 100644
--- a/cpukit/score/cpu/sparc/ChangeLog
+++ b/cpukit/score/cpu/sparc/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-06	Ralf Corsepius <ralf_corsepius@rtems.org>
+
+	* configure.ac: Remove (Merged into$(top_srcdir)/configure.ac).
+	* Makefile.am: Don't include multilib.am.
+	Reflect merging configure.ac into $(top_srcdir)/configure.ac.
+
 2004-04-01	Ralf Corsepius <ralf_corsepius@rtems.org>
 
 	* Makefile.am: Install asm.h to $(includedir)/rtems.
diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am
index b5eb50d3fd..ee7d11cad3 100644
--- a/cpukit/score/cpu/sparc/Makefile.am
+++ b/cpukit/score/cpu/sparc/Makefile.am
@@ -2,10 +2,8 @@
 ## $Id$
 ##
 
-ACLOCAL_AMFLAGS = -I ../../../aclocal
 
-include $(top_srcdir)/../../../automake/multilib.am
-include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/automake/compile.am
 
 include_rtemsdir = $(includedir)/rtems
 include_rtems_HEADERS = asm.h
@@ -58,4 +56,4 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
 CLEANFILES += $(PREINSTALL_FILES)
 DISTCLEANFILES = $(PREINSTALL_DIRS)
 
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/automake/local.am
diff --git a/cpukit/score/cpu/sparc/configure.ac b/cpukit/score/cpu/sparc/configure.ac
deleted file mode 100644
index 69147e6c7f..0000000000
--- a/cpukit/score/cpu/sparc/configure.ac
+++ /dev/null
@@ -1,26 +0,0 @@
-## Process this file with autoconf to produce a configure script.
-## 
-## $Id$
-
-AC_PREREQ(2.59)
-AC_INIT([rtems-cpukit-score-cpu-sparc],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
-AC_CONFIG_SRCDIR([cpu_asm.S])
-RTEMS_TOP([../../../..])
-
-RTEMS_CANONICAL_TARGET_CPU
-
-AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.8.1])
-AM_MAINTAINER_MODE
-
-RTEMS_ENV_RTEMSCPU
-
-RTEMS_PROG_CC_FOR_TARGET
-RTEMS_PROG_CCAS
-RTEMS_CANONICALIZE_TOOLS
-AC_PROG_RANLIB
-
-RTEMS_CHECK_NEWLIB
-
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT