diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-12-11 17:08:38 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-12-11 17:08:38 +0000 |
| commit | 53021d4abb385455ec445fd53744427c095dd7c5 (patch) | |
| tree | 0b6cee839acaff783748574f2f6ed814ac939786 /cpukit/score/cpu/i960 | |
| parent | 2002-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-53021d4abb385455ec445fd53744427c095dd7c5.tar.bz2 | |
2002-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Require autoconf-2.57 + automake-1.7.2.
* Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS.
Diffstat (limited to 'cpukit/score/cpu/i960')
| -rw-r--r-- | cpukit/score/cpu/i960/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/score/cpu/i960/Makefile.am | 8 | ||||
| -rw-r--r-- | cpukit/score/cpu/i960/configure.ac | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/cpukit/score/cpu/i960/ChangeLog b/cpukit/score/cpu/i960/ChangeLog index 567928eb27..df9e186e12 100644 --- a/cpukit/score/cpu/i960/ChangeLog +++ b/cpukit/score/cpu/i960/ChangeLog @@ -1,3 +1,8 @@ +2002-12-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * configure.ac: Require autoconf-2.57 + automake-1.7.2. + * Makefile.am: Eliminate C_O_FILES, S_O_FILES, libscorecpu_a_OBJECTS. + 2002-11-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Fix package name. diff --git a/cpukit/score/cpu/i960/Makefile.am b/cpukit/score/cpu/i960/Makefile.am index b812f260f9..c0376aea65 100644 --- a/cpukit/score/cpu/i960/Makefile.am +++ b/cpukit/score/cpu/i960/Makefile.am @@ -32,16 +32,14 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h) C_FILES = cpu.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) S_FILES = cpu_asm.S -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) +OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT)) LIB = $(ARCH)/libscorecpu.a -libscorecpu_a_OBJECTS = $(C_O_FILES) $(S_O_FILES) - -$(LIB): $(libscorecpu_a_OBJECTS) +$(LIB): $(OBJS) $(make-library) all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \ diff --git a/cpukit/score/cpu/i960/configure.ac b/cpukit/score/cpu/i960/configure.ac index 0408f75bfb..067e6964cc 100644 --- a/cpukit/score/cpu/i960/configure.ac +++ b/cpukit/score/cpu/i960/configure.ac @@ -2,7 +2,7 @@ ## ## $Id$ -AC_PREREQ(2.52) +AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-i960],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpu_asm.S]) RTEMS_TOP(../../../..) @@ -10,7 +10,7 @@ AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU -AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.6]) +AM_INIT_AUTOMAKE([no-define nostdinc foreign 1.7.2]) AM_MAINTAINER_MODE RTEMS_ENV_RTEMSCPU |