From 3c55718acadc1c6b029e4116d4261b0cd4dc644c Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 11 Mar 2003 09:06:13 +0000
Subject: Merger from rtems-4-6-branch.

---
 c/src/librtems++/ChangeLog    | 8 ++++++++
 c/src/librtems++/Makefile.am  | 2 +-
 c/src/librtems++/configure.ac | 1 -
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'c/src/librtems++')

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
-- 
cgit v1.2.3