diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-06 02:21:50 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-04-06 02:21:50 +0000 |
| commit | be2ed3e262c93efb2c58e98f1396224524aa4243 (patch) | |
| tree | a7cf6aa86e91d5404ac1c0e6155079c8ee2f55eb /cpukit/score/cpu/i960 | |
| parent | 2004-04-06 Ralf Corsepius <ralf_corsepius@rtems.org> (diff) | |
| download | rtems-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/score/cpu/i960')
| -rw-r--r-- | cpukit/score/cpu/i960/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/score/cpu/i960/Makefile.am | 7 | ||||
| -rw-r--r-- | cpukit/score/cpu/i960/configure.ac | 26 |
3 files changed, 8 insertions, 31 deletions
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 |