From 3b5dc96476e6dd6c37e4e04bd888c2b68bdcaf33 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 18 Oct 2000 13:03:14 +0000 Subject: 2000-10-18 Joel Sherrill * Makefile.am: Corrected condition CPU model selection so multilib'ing and bare BSP works. --- c/src/lib/libcpu/i960/ChangeLog | 5 +++++ c/src/lib/libcpu/i960/Makefile.am | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/c/src/lib/libcpu/i960/ChangeLog b/c/src/lib/libcpu/i960/ChangeLog index bd2c9128b7..d633c4df96 100644 --- a/c/src/lib/libcpu/i960/ChangeLog +++ b/c/src/lib/libcpu/i960/ChangeLog @@ -1,3 +1,8 @@ +2000-10-18 Joel Sherrill + + * Makefile.am: Corrected condition CPU model selection so + multilib'ing and bare BSP works. + 2000-09-04 Ralf Corsepius * i960ca/Makefile.am, i960ka/Makefile.am, i960rp/Makefile.am: diff --git a/c/src/lib/libcpu/i960/Makefile.am b/c/src/lib/libcpu/i960/Makefile.am index e06ecba3be..7b2eb8313e 100644 --- a/c/src/lib/libcpu/i960/Makefile.am +++ b/c/src/lib/libcpu/i960/Makefile.am @@ -5,7 +5,19 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -SUBDIRS = include @RTEMS_CPU_MODEL@ +if i960ca +CPU_SUBDIR = i960ca +endif + +if i960ka +CPU_SUBDIR = i960ka +endif + +if i960rp +CPU_SUBDIR = i960rp +endif + +SUBDIRS = include $(CPU_SUBDIR) include $(top_srcdir)/../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../automake/local.am -- cgit v1.2.3