From c672d972e8e4ad29d350c1ef8a1d2c3b1a39c7d9 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 4 Jan 2002 17:53:48 +0000
Subject: 2001-12-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.ac: Remove references to POSIX, ITRON, MULTILIB.
	* Makefile.ac: Remove librtems, libposix, libitron. Build
	librtemsbsp instead of librtemsall.
---
 c/src/wrapup/ChangeLog    |  6 ++++++
 c/src/wrapup/Makefile.am  | 27 ++++-----------------------
 c/src/wrapup/configure.ac |  7 ++-----
 3 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/c/src/wrapup/ChangeLog b/c/src/wrapup/ChangeLog
index 0ba68ccd01..cef2e1dfac 100644
--- a/c/src/wrapup/ChangeLog
+++ b/c/src/wrapup/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* configure.ac: Remove references to POSIX, ITRON, MULTILIB.
+	* Makefile.ac: Remove librtems, libposix, libitron. Build
+	librtemsbsp instead of librtemsall.
+
 2001-12-20	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Add AM_CONDITIONAL for enable_multilib,
diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am
index 4aafb74627..0a8e4af86f 100644
--- a/c/src/wrapup/Makefile.am
+++ b/c/src/wrapup/Makefile.am
@@ -1,7 +1,7 @@
 ##
 ##  $Id$
 ##
-##  build and install "glommed" librtemsall.a
+##  build and install "glommed" librtemsbsp.a
 ##
 
 AUTOMAKE_OPTIONS = foreign 1.4
@@ -11,17 +11,7 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-LIB = $(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a
-
-# HACK: We need to evaluate CFLAGS at make-time, because these
-#	fscking <bsp>.cfgs change CFLAGS and can change 
-#	MULTISUBDIR on-the-fly - A true PITA :(
-if MULTILIB
-MULTISUBDIR = /$(shell $(CC) --print-multi-directory $(CFLAGS))
-PROJECT_CPUdir = $(PROJECT_ROOT)/lib$(MULTISUBDIR)
-else
-PROJECT_CPUdir = $(PROJECT_RELEASE)/lib
-endif
+LIB = $(PROJECT_RELEASE)/lib/librtemsbsp${LIB_VARIANT}.a
 
 if HAS_NETWORKING
 LIBNETWORKING = $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a \
@@ -33,17 +23,8 @@ if HAS_RDBG
 LIBRDBG = $(PROJECT_RELEASE)/lib/librdbg$(LIB_VARIANT).a
 endif
 
-if HAS_POSIX
-LIBPOSIX = $(PROJECT_CPUdir)/libposix$(LIB_VARIANT).a
-endif
-
-if HAS_ITRON
-LIBITRON = $(PROJECT_CPUdir)/libitron$(LIB_VARIANT).a
-endif
-
 SRCS =  $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a
-SRCS += $(PROJECT_CPUdir)/librtems$(LIB_VARIANT).a
-SRCS += $(LIBNETWORKING) $(LIBRDBG) $(LIBPOSIX) $(LIBITRON) \
+SRCS += $(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) \
@@ -53,7 +34,7 @@ SRCS += $(LIBNETWORKING) $(LIBRDBG) $(LIBPOSIX) $(LIBITRON) \
     $(PROJECT_RELEASE)/lib/libfs$(LIB_VARIANT).a \
     $(wildcard $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o)
 
-TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/librtemsall${LIB_VARIANT}.a
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/librtemsbsp${LIB_VARIANT}.a
 
 all-local: $(ARCH) $(TMPINSTALL_FILES)
 
diff --git a/c/src/wrapup/configure.ac b/c/src/wrapup/configure.ac
index 4a4fe568b8..453bb81e8a 100644
--- a/c/src/wrapup/configure.ac
+++ b/c/src/wrapup/configure.ac
@@ -36,11 +36,8 @@ RTEMS_PROJECT_ROOT
 RTEMS_PROG_CC_FOR_TARGET
 RTEMS_CANONICALIZE_TOOLS
 
-AM_CONDITIONAL([MULTILIB],[test x"$enable_multilib" = x"yes"])
-AM_CONDITIONAL([HAS_POSIX],[test x"$enable_posix" = x"yes"])
-AM_CONDITIONAL([HAS_ITRON],[test x"$enable_itron" = x"yes"])
+AM_CONDITIONAL([MULTILIB],[test x"${enable_multilib}" = x"yes"])
 
 # Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
-])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
-- 
cgit v1.2.3