From 5710072a717a40d36152283908c3a53533af433d Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 8 Aug 2003 03:14:14 +0000 Subject: 2003-08-08 Ralf Corsepius * configure.ac: Remove (Merged into ../../configure.ac). * Makefile.am: Reflect having merged configure.ac into ../../configure.ac. --- c/src/lib/libcpu/ChangeLog | 6 ++++++ c/src/lib/libcpu/Makefile.am | 22 ++++------------------ c/src/lib/libcpu/configure.ac | 21 --------------------- 3 files changed, 10 insertions(+), 39 deletions(-) delete mode 100644 c/src/lib/libcpu/configure.ac (limited to 'c/src/lib/libcpu') diff --git a/c/src/lib/libcpu/ChangeLog b/c/src/lib/libcpu/ChangeLog index 269c25f842..669eecb766 100644 --- a/c/src/lib/libcpu/ChangeLog +++ b/c/src/lib/libcpu/ChangeLog @@ -1,3 +1,9 @@ +2003-08-08 Ralf Corsepius + + * configure.ac: Remove (Merged into ../../configure.ac). + * Makefile.am: Reflect having merged configure.ac into + ../../configure.ac. + 2003-03-06 Ralf Corsepius * configure.ac: Remove AC_CONFIG_AUX_DIR. diff --git a/c/src/lib/libcpu/Makefile.am b/c/src/lib/libcpu/Makefile.am index 2e4a1ce43b..35eeb1d2a6 100644 --- a/c/src/lib/libcpu/Makefile.am +++ b/c/src/lib/libcpu/Makefile.am @@ -2,27 +2,13 @@ ## $Id$ ## -ACLOCAL_AMFLAGS = -I ../../../../aclocal - noinst_HEADERS = shared/include/cache.h noinst_HEADERS += shared/src/cache_aligned_malloc.c \ shared/src/cache_manager.c +SUBDIRS = @libcpu_cpu_subdir@ +DIST_SUBDIRS = @libcpu_cpu_subdir@ -SUBDIRS = @subdirs@ - -DIST_SUBDIRS = \ -hppa1.1 \ -i386 \ -i960 \ -m68k \ -mips \ -mips64orion \ -powerpc \ -sh \ -shared \ -sparc - -include $(top_srcdir)/../../../../automake/subdirs.am -include $(top_srcdir)/../../../../automake/local.am +include $(top_srcdir)/../../automake/subdirs.am +include $(top_srcdir)/../../automake/local.am diff --git a/c/src/lib/libcpu/configure.ac b/c/src/lib/libcpu/configure.ac deleted file mode 100644 index 2f0019c647..0000000000 --- a/c/src/lib/libcpu/configure.ac +++ /dev/null @@ -1,21 +0,0 @@ -## Process this file with autoconf to produce a configure script. -## -## $Id$ - -AC_PREREQ(2.57) -AC_INIT([rtems-c-src-lib-libcpu],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) -AC_CONFIG_SRCDIR([README]) -RTEMS_TOP(../../../..) - -RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define foreign 1.7.2]) -AM_MAINTAINER_MODE - -RTEMS_CHECK_CPU -RTEMS_CANONICAL_HOST - -RTEMS_CPU_SUBDIRS - -# Explicitly list all Makefiles here -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT -- cgit v1.2.3