summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-08-10 04:07:26 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-08-10 04:07:26 +0000
commit2b61cd0618eb20d991c93ddfdaabe318079a4d76 (patch)
tree8bded93cbdfcb9cf9ca3b9440448cdf24bf32089
parent2002-08-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-2b61cd0618eb20d991c93ddfdaabe318079a4d76.tar.bz2
2002-08-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Pick up ../libchip/rtc/$(ARCH)/librtcio.a and ../libchip/serial/$(ARCH)/libserialio.a.
-rw-r--r--c/src/ChangeLog7
-rw-r--r--c/src/wrapup/Makefile.am4
2 files changed, 8 insertions, 3 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog
index ae67289245..be7406f188 100644
--- a/c/src/ChangeLog
+++ b/c/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * wrapup/Makefile.am: Pick up ../libchip/rtc/$(ARCH)/librtcio.a and
+ ../libchip/serial/$(ARCH)/libserialio.a.
+
2002-08-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add rtems_makedir.
@@ -12,7 +17,7 @@
2002-08-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
- * Makefile.am: Append BARE_CPU_MODEL tp make/@RTEMS_BSP@.cache
+ * Makefile.am: Append BARE_CPU_MODEL to make/@RTEMS_BSP@.cache
creation (Make the bare BSP happy).
* configure.ac: Ditto.
diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am
index a44a4128d8..50908995f9 100644
--- a/c/src/wrapup/Makefile.am
+++ b/c/src/wrapup/Makefile.am
@@ -24,8 +24,8 @@ endif
SRCS = $(LIBBSP) $(LIBNETWORKING) $(LIBRDBG) \
$(wildcard $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a) \
- $(wildcard $(PROJECT_RELEASE)/lib/librtcio$(LIB_VARIANT).a) \
- $(wildcard $(PROJECT_RELEASE)/lib/libserialio$(LIB_VARIANT).a) \
+ ../libchip/rtc/$(ARCH)/librtcio.a \
+ ../libchip/serial/$(ARCH)/libserialio.a \
$(wildcard $(PROJECT_RELEASE)/lib/libnetchip$(LIB_VARIANT).a) \
../libmisc/wrapup/$(ARCH)/libmisc.a \
$(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o)