summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-04-06 02:21:50 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-04-06 02:21:50 +0000
commitbe2ed3e262c93efb2c58e98f1396224524aa4243 (patch)
treea7cf6aa86e91d5404ac1c0e6155079c8ee2f55eb /cpukit
parent2004-04-06 Ralf Corsepius <ralf_corsepius@rtems.org> (diff)
downloadrtems-be2ed3e262c93efb2c58e98f1396224524aa4243.tar.bz2
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.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/score/cpu/arm/ChangeLog6
-rw-r--r--cpukit/score/cpu/arm/Makefile.am7
-rw-r--r--cpukit/score/cpu/arm/configure.ac26
-rw-r--r--cpukit/score/cpu/c4x/ChangeLog6
-rw-r--r--cpukit/score/cpu/c4x/Makefile.am7
-rw-r--r--cpukit/score/cpu/c4x/configure.ac26
-rw-r--r--cpukit/score/cpu/h8300/ChangeLog6
-rw-r--r--cpukit/score/cpu/h8300/Makefile.am7
-rw-r--r--cpukit/score/cpu/h8300/configure.ac26
-rw-r--r--cpukit/score/cpu/i386/ChangeLog6
-rw-r--r--cpukit/score/cpu/i386/Makefile.am7
-rw-r--r--cpukit/score/cpu/i386/configure.ac26
-rw-r--r--cpukit/score/cpu/i960/ChangeLog6
-rw-r--r--cpukit/score/cpu/i960/Makefile.am7
-rw-r--r--cpukit/score/cpu/i960/configure.ac26
-rw-r--r--cpukit/score/cpu/m68k/ChangeLog6
-rw-r--r--cpukit/score/cpu/m68k/Makefile.am7
-rw-r--r--cpukit/score/cpu/m68k/configure.ac26
-rw-r--r--cpukit/score/cpu/mips/ChangeLog6
-rw-r--r--cpukit/score/cpu/mips/Makefile.am6
-rw-r--r--cpukit/score/cpu/mips/configure.ac27
-rw-r--r--cpukit/score/cpu/powerpc/ChangeLog6
-rw-r--r--cpukit/score/cpu/powerpc/Makefile.am7
-rw-r--r--cpukit/score/cpu/powerpc/configure.ac26
24 files changed, 64 insertions, 248 deletions
diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog
index 8116575489..62212bc773 100644
--- a/cpukit/score/cpu/arm/ChangeLog
+++ b/cpukit/score/cpu/arm/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/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am
index 0320eb4c22..f3231c01ab 100644
--- a/cpukit/score/cpu/arm/Makefile.am
+++ b/cpukit/score/cpu/arm/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/arm/configure.ac b/cpukit/score/cpu/arm/configure.ac
deleted file mode 100644
index 870ca9e616..0000000000
--- a/cpukit/score/cpu/arm/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-arm],[_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
diff --git a/cpukit/score/cpu/c4x/ChangeLog b/cpukit/score/cpu/c4x/ChangeLog
index f7b8332475..9b10463e6d 100644
--- a/cpukit/score/cpu/c4x/ChangeLog
+++ b/cpukit/score/cpu/c4x/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-02 Ralf Corsepius <ralf_corsepius@rtems.org>
* Makefile.am: Install c4xio.h to $(includedir)/rtems/c4x.
diff --git a/cpukit/score/cpu/c4x/Makefile.am b/cpukit/score/cpu/c4x/Makefile.am
index 50668ba9b2..24378adb05 100644
--- a/cpukit/score/cpu/c4x/Makefile.am
+++ b/cpukit/score/cpu/c4x/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
@@ -74,4 +71,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/c4x/configure.ac b/cpukit/score/cpu/c4x/configure.ac
deleted file mode 100644
index 480b68e0a5..0000000000
--- a/cpukit/score/cpu/c4x/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-c4x],[_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
diff --git a/cpukit/score/cpu/h8300/ChangeLog b/cpukit/score/cpu/h8300/ChangeLog
index 80e8380551..b6192d6643 100644
--- a/cpukit/score/cpu/h8300/ChangeLog
+++ b/cpukit/score/cpu/h8300/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/h8300/Makefile.am b/cpukit/score/cpu/h8300/Makefile.am
index 00fa841e16..328037e175 100644
--- a/cpukit/score/cpu/h8300/Makefile.am
+++ b/cpukit/score/cpu/h8300/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
@@ -58,4 +55,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/h8300/configure.ac b/cpukit/score/cpu/h8300/configure.ac
deleted file mode 100644
index c637d966e5..0000000000
--- a/cpukit/score/cpu/h8300/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-h8300],[_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
diff --git a/cpukit/score/cpu/i386/ChangeLog b/cpukit/score/cpu/i386/ChangeLog
index 5ca223af4f..a3984c84a6 100644
--- a/cpukit/score/cpu/i386/ChangeLog
+++ b/cpukit/score/cpu/i386/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/i386/Makefile.am b/cpukit/score/cpu/i386/Makefile.am
index 1af85ad421..243fc91436 100644
--- a/cpukit/score/cpu/i386/Makefile.am
+++ b/cpukit/score/cpu/i386/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
@@ -71,4 +68,4 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/idtr.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/i386/configure.ac b/cpukit/score/cpu/i386/configure.ac
deleted file mode 100644
index 1b8af928dd..0000000000
--- a/cpukit/score/cpu/i386/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-i386],[_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
diff --git a/cpukit/score/cpu/i960/ChangeLog b/cpukit/score/cpu/i960/ChangeLog
index 7ef57e380b..bd3494374a 100644
--- a/cpukit/score/cpu/i960/ChangeLog
+++ b/cpukit/score/cpu/i960/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/i960/Makefile.am b/cpukit/score/cpu/i960/Makefile.am
index 835c6e0fb0..c30ddf4213 100644
--- a/cpukit/score/cpu/i960/Makefile.am
+++ b/cpukit/score/cpu/i960/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
@@ -58,4 +55,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/i960/configure.ac b/cpukit/score/cpu/i960/configure.ac
deleted file mode 100644
index fd5bb6c602..0000000000
--- a/cpukit/score/cpu/i960/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-i960],[_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
diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog
index 57e845a5d0..bf80059917 100644
--- a/cpukit/score/cpu/m68k/ChangeLog
+++ b/cpukit/score/cpu/m68k/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-03 Ralf Corsepius <ralf_corsepius@rtems.org>
* Makefile.am: Install m68302.h m68360.h qsm.h sim.h
diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am
index 1515e0b047..f5323ff629 100644
--- a/cpukit/score/cpu/m68k/Makefile.am
+++ b/cpukit/score/cpu/m68k/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
EXTRA_LIBRARIES = libscorecpu.a
CLEANFILES = libscorecpu.a
@@ -84,4 +81,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/m68k/configure.ac b/cpukit/score/cpu/m68k/configure.ac
deleted file mode 100644
index 1d4d57fd34..0000000000
--- a/cpukit/score/cpu/m68k/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-m68k],[_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
diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog
index 0be5c022f1..63b7655a21 100644
--- a/cpukit/score/cpu/mips/ChangeLog
+++ b/cpukit/score/cpu/mips/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-03 Art Ferrer <arturo.b.ferrer@nasa.gov>
PR 598/bsps
diff --git a/cpukit/score/cpu/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am
index ac1ed2e10b..56e54f1176 100644
--- a/cpukit/score/cpu/mips/Makefile.am
+++ b/cpukit/score/cpu/mips/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
@@ -74,4 +72,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/mips/configure.ac b/cpukit/score/cpu/mips/configure.ac
deleted file mode 100644
index 8fe318c16a..0000000000
--- a/cpukit/score/cpu/mips/configure.ac
+++ /dev/null
@@ -1,27 +0,0 @@
-## Process this file with autoconf to produce a configure script.
-##
-## $Id$
-
-AC_PREREQ(2.59)
-AC_INIT([rtems-cpukit-score-cpu-mips],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
-AC_CONFIG_SRCDIR([cpu_asm.S])
-RTEMS_TOP([../../../..])
-
-RTEMS_CANONICAL_TARGET_CPU
-
-AM_INIT_AUTOMAKE([no-define nostdinc subdir-objects foreign 1.8.1])
-AM_MAINTAINER_MODE
-
-RTEMS_ENV_RTEMSCPU
-
-RTEMS_PROG_CC_FOR_TARGET
-AM_PROG_CC_C_O
-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/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog
index 133e8f4c95..ec62d98e5e 100644
--- a/cpukit/score/cpu/powerpc/ChangeLog
+++ b/cpukit/score/cpu/powerpc/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/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am
index d2baad821b..aaad49c43b 100644
--- a/cpukit/score/cpu/powerpc/Makefile.am
+++ b/cpukit/score/cpu/powerpc/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
@@ -84,4 +81,4 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/registers.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/powerpc/configure.ac b/cpukit/score/cpu/powerpc/configure.ac
deleted file mode 100644
index 637ffcf262..0000000000
--- a/cpukit/score/cpu/powerpc/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-powerpc],[_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