summaryrefslogtreecommitdiffstats
path: root/c/src/librtems++
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-03-11 09:06:13 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-03-11 09:06:13 +0000
commit3c55718acadc1c6b029e4116d4261b0cd4dc644c (patch)
tree9d512f0b6a6c236cb86055e03cf12518fb1e1851 /c/src/librtems++
parentMerger from rtems-4-6-branch. (diff)
downloadrtems-3c55718acadc1c6b029e4116d4261b0cd4dc644c.tar.bz2
Merger from rtems-4-6-branch.
Diffstat (limited to 'c/src/librtems++')
-rw-r--r--c/src/librtems++/ChangeLog8
-rw-r--r--c/src/librtems++/Makefile.am2
-rw-r--r--c/src/librtems++/configure.ac1
3 files changed, 9 insertions, 2 deletions
diff --git a/c/src/librtems++/ChangeLog b/c/src/librtems++/ChangeLog
index b3c1ab24eb..722968fc69 100644
--- a/c/src/librtems++/ChangeLog
+++ b/c/src/librtems++/ChangeLog
@@ -1,3 +1,11 @@
+2003-03-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Remove AC_CONFIG_AUX_DIR.
+
+2003-03-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Build librtems++$(LIB_VARIANT).a
+
2002-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Eliminate *_O_FILES.
diff --git a/c/src/librtems++/Makefile.am b/c/src/librtems++/Makefile.am
index c000f896a0..9b2032f5f7 100644
--- a/c/src/librtems++/Makefile.am
+++ b/c/src/librtems++/Makefile.am
@@ -26,7 +26,7 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems++ \
endif
-LIB = ${ARCH}/librtems++.a
+LIB = ${ARCH}/librtems++$(LIB_VARIANT).a
CC_FILES = src/rtemsEvent.cc src/rtemsInterrupt.cc src/rtemsMessageQueue.cc \
src/rtemsSemaphore.cc src/rtemsStatusCode.cc src/rtemsTask.cc src/rtemsTimer.cc
diff --git a/c/src/librtems++/configure.ac b/c/src/librtems++/configure.ac
index 2ba7e6bd35..26fb35ebb1 100644
--- a/c/src/librtems++/configure.ac
+++ b/c/src/librtems++/configure.ac
@@ -6,7 +6,6 @@ AC_PREREQ(2.57)
AC_INIT([rtems-c-src-librtems++],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com],[rtems-c-src-librtems++])
AC_CONFIG_SRCDIR([include/rtems++])
RTEMS_TOP(../../..)
-AC_CONFIG_AUX_DIR(../../..)
RTEMS_CANONICAL_TARGET_CPU
RTEMS_CANONICAL_HOST