summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--c/src/ChangeLog5
-rw-r--r--c/src/wrapup/Makefile.am3
2 files changed, 7 insertions, 1 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index 7f6a58b61e..254c9508a1 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-15 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * wrapup/Makefile.am: Many BSPs do not include any .rel files now so do
+ not fail if there are none.
+
2008-05-15 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* libchip/i2c/spi-flash-m25p40.c, libchip/i2c/spi-flash-m25p40.h,
diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am
index 474b417f38..d9f66547f0 100644
--- a/c/src/wrapup/Makefile.am
+++ b/c/src/wrapup/Makefile.am
@@ -61,7 +61,8 @@ o-optimize/librtemsbsp.a: $(SRCS)
;; \
esac; \
done
- ls o-optimize/*.$(OBJEXT) o-optimize/*.rel > $@-list
+ ls o-optimize/*.$(OBJEXT) > $@-list
+ -ls o-optimize/*.rel >> $@-list
$(AR) rc $@ @$@-list
rm -f $@-list o-optimize/*.$(OBJEXT) o-optimize/*.rel
$(RANLIB) $@