2001-10-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am: reformat noinst_HEADERS to work around a bug in
	automake-1.4-p5.
	* configure.in: autoupdate to autoconf-2.52, apply RTEMS_CPU_SUBDIRS.

c/src/lib/libcpu/ChangeLog

@@ -1,3 +1,10 @@
+2001-10-09	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: reformat noinst_HEADERS to work around a bug in
+	automake-1.4-p5.
+	* configure.in: autoupdate to autoconf-2.52, apply
+	RTEMS_CPU_SUBDIRS.
+
 2000-12-06	Joel Sherrill <joel@OARcorp.com>
 
 	* shared/src/cache_aligned_malloc.c: Added include of <stdlib.h>

c/src/lib/libcpu/Makefile.am

@@ -5,7 +5,25 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I ../../../../aclocal
 
-SUBDIRS = @RTEMS_CPU_SUBDIR@
+noinst_HEADERS = shared/include/cache.h
+
+noinst_HEADERS += shared/src/cache_aligned_malloc.c \
+shared/src/cache_manager.c
+
+
+SUBDIRS = @subdirs@
+
+DIST_SUBDIRS = \
+a29k \
+hppa1.1 \
+i386 \
+i960 \
+m68k \
+mips \
+mips64orion \
+powerpc \
+sh \
+sparc
 
 include $(top_srcdir)/../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../automake/local.am

c/src/lib/libcpu/configure.in

@@ -2,8 +2,9 @@ dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl $Id$
 
-AC_PREREQ(2.13)
-AC_INIT(README)
+AC_PREREQ(2.52)
+AC_INIT
+AC_CONFIG_SRCDIR([README])
 RTEMS_TOP(../../../..)
 AC_CONFIG_AUX_DIR(../../../..)
 
@@ -14,14 +15,8 @@ AM_MAINTAINER_MODE
 RTEMS_CHECK_CPU
 RTEMS_CANONICAL_HOST
 
-# find all the CPU dependent library Makefiles
-if test -f $srcdir/$RTEMS_CPU/configure.in; then
-  RTEMS_CPU_SUBDIR="$RTEMS_CPU"
-fi
-AC_SUBST(RTEMS_CPU_SUBDIR)
-
-AC_CONFIG_SUBDIRS($RTEMS_CPU_SUBDIR)
+RTEMS_CPU_SUBDIRS
 
 # Explicitly list all Makefiles here
-AC_OUTPUT( 
-Makefile)
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT