From 989b9383f8119a0ebd442c35eb2e2df52b3409db Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Wed, 19 Dec 2001 14:37:05 +0000
Subject: 2001-12-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* wrapup/posix/Makefile.am: Add multilib support.
	* wrapup/itron/Makefile.am: Add multilib support.
	* wrapup/rtems/Makefile.am: Add multilib support.
	* Makefile.am: Add multilib support.
---
 c/src/exec/ChangeLog                | 7 +++++++
 c/src/exec/Makefile.am              | 2 ++
 c/src/exec/wrapup/itron/Makefile.am | 6 +++---
 c/src/exec/wrapup/posix/Makefile.am | 6 +++---
 c/src/exec/wrapup/rtems/Makefile.am | 9 +++------
 5 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'c/src')

diff --git a/c/src/exec/ChangeLog b/c/src/exec/ChangeLog
index cdbb73b501..6662750f44 100644
--- a/c/src/exec/ChangeLog
+++ b/c/src/exec/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* wrapup/posix/Makefile.am: Add multilib support.
+	* wrapup/itron/Makefile.am: Add multilib support.
+	* wrapup/rtems/Makefile.am: Add multilib support.
+	* Makefile.am: Add multilib support.
+
 2001-10-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Use RTEMS_CPU_SUBDIRS to make autoconf-2.52 happy.
diff --git a/c/src/exec/Makefile.am b/c/src/exec/Makefile.am
index 4886cff1e3..c7627f5948 100644
--- a/c/src/exec/Makefile.am
+++ b/c/src/exec/Makefile.am
@@ -5,6 +5,8 @@
 AUTOMAKE_OPTIONS = foreign 1.5
 ACLOCAL_AMFLAGS = -I ../../../aclocal
 
+include $(top_srcdir)/../../../automake/multilib.am
+
 if HAS_POSIX
 POSIX_SUBDIRS = posix
 endif
diff --git a/c/src/exec/wrapup/itron/Makefile.am b/c/src/exec/wrapup/itron/Makefile.am
index e57cf40270..8d8e0d7ed7 100644
--- a/c/src/exec/wrapup/itron/Makefile.am
+++ b/c/src/exec/wrapup/itron/Makefile.am
@@ -9,7 +9,7 @@ LIBNAME = libitron
 LIB = $(ARCH)/$(LIBNAME).a
 endif
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
@@ -22,9 +22,9 @@ OBJS = $(ITRON_OBJS)
 $(LIB): ${OBJS}
 	$(make-library)
 
-ITRON_LIB = $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+ITRON_LIB = $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
 
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
+$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
 
 all-local: ${ARCH} $(LIB) $(TMPINSTALL_FILES)
diff --git a/c/src/exec/wrapup/posix/Makefile.am b/c/src/exec/wrapup/posix/Makefile.am
index b70e603e5b..6c763f52e2 100644
--- a/c/src/exec/wrapup/posix/Makefile.am
+++ b/c/src/exec/wrapup/posix/Makefile.am
@@ -9,7 +9,7 @@ LIBNAME = libposix
 LIB = $(ARCH)/$(LIBNAME).a
 endif
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
@@ -22,9 +22,9 @@ OBJS = $(POSIX_OBJS)
 $(LIB): ${OBJS}
 	$(make-library)
 
-POSIX_LIB = $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+POSIX_LIB = $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
 
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
+$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
 
 all-local: ${ARCH} $(LIB) $(TMPINSTALL_FILES)
diff --git a/c/src/exec/wrapup/rtems/Makefile.am b/c/src/exec/wrapup/rtems/Makefile.am
index f26028a16d..3b1df23777 100644
--- a/c/src/exec/wrapup/rtems/Makefile.am
+++ b/c/src/exec/wrapup/rtems/Makefile.am
@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = foreign 1.4
 LIBNAME = librtems
 LIB = $(ARCH)/$(LIBNAME).a
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
@@ -22,13 +22,10 @@ SIZE_RTEMS = $(SHELL) $(PROJECT_TOPdir)/tools/cpu/generic/size_rtems
 
 $(LIB): ${OBJS}
 	$(make-library)
-#	cd $(PROJECT_ROOT) ; \
-#	 $(SIZE_RTEMS) @RTEMS_BSP@ $(ARCH) \
-#	 >$(PROJECT_RELEASE)/lib/sizeinfo$(LIB_VARIANT).txt
 
-TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
 
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
+$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
 
 all-local: ${ARCH} $(TMPINSTALL_FILES)
-- 
cgit v1.2.3