From be2ed3e262c93efb2c58e98f1396224524aa4243 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 6 Apr 2004 02:21:50 +0000 Subject: 2004-04-06 Ralf Corsepius * 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. --- cpukit/score/cpu/arm/ChangeLog | 6 ++++++ cpukit/score/cpu/arm/Makefile.am | 7 ++----- cpukit/score/cpu/arm/configure.ac | 26 -------------------------- 3 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 cpukit/score/cpu/arm/configure.ac (limited to 'cpukit/score/cpu/arm') 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 + + * 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 * 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 -- cgit v1.2.3