diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-10-18 13:03:14 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-10-18 13:03:14 +0000 |
commit | 3b5dc96476e6dd6c37e4e04bd888c2b68bdcaf33 (patch) | |
tree | 0257f3c7fbf4a822458dfc0fed4b152f48024737 /c/src/lib | |
parent | 2000-10-18 Joel Sherrill <joel@OARcorp.com> (diff) | |
download | rtems-3b5dc96476e6dd6c37e4e04bd888c2b68bdcaf33.tar.bz2 |
2000-10-18 Joel Sherrill <joel@OARcorp.com>
* Makefile.am: Corrected condition CPU model selection so
multilib'ing and bare BSP works.
Diffstat (limited to 'c/src/lib')
-rw-r--r-- | c/src/lib/libcpu/i960/ChangeLog | 5 | ||||
-rw-r--r-- | c/src/lib/libcpu/i960/Makefile.am | 14 |
2 files changed, 18 insertions, 1 deletions
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 <joel@OARcorp.com> + + * Makefile.am: Corrected condition CPU model selection so + multilib'ing and bare BSP works. + 2000-09-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * 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 |