summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/lib/libbsp/arm/armulator/ChangeLog5
-rw-r--r--c/src/lib/libbsp/arm/armulator/Makefile.am7
2 files changed, 11 insertions, 1 deletions
diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog
index 30847714fe..7de6ded67a 100644
--- a/c/src/lib/libbsp/arm/armulator/ChangeLog
+++ b/c/src/lib/libbsp/arm/armulator/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-15 Ray Xu <rayx@gmail.com>
+
+ * Makefile.am: Add abort.rel since it is now in the BSP shared source
+ -- not in score/cpu.
+
2007-05-03 Joel Sherrill <joel@OARcorp.com>
* startup/linkcmds: Add alignment between data and bss to avoid linking
diff --git a/c/src/lib/libbsp/arm/armulator/Makefile.am b/c/src/lib/libbsp/arm/armulator/Makefile.am
index 0b417da47c..22ed4f82ce 100644
--- a/c/src/lib/libbsp/arm/armulator/Makefile.am
+++ b/c/src/lib/libbsp/arm/armulator/Makefile.am
@@ -48,9 +48,14 @@ timer_rel_SOURCES = ../../shared/timerstub.c
timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+noinst_PROGRAMS += abort.rel
+abort_rel_SOURCES = ../shared/abort/abort.c
+abort_rel_CPPFLAGS = $(AM_CPPFLAGS)
+abort_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
+
noinst_LIBRARIES = libbsp.a
libbsp_a_SOURCES =
-libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel
+libbsp_a_LIBADD = startup.rel clock.rel console.rel timer.rel abort.rel
include $(srcdir)/preinstall.am
include $(top_srcdir)/../../../../automake/local.am