From 624c881ae0ec2461efbc36cd87623fd4e2e9c23a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 19 Dec 2001 14:35:14 +0000 Subject: 2001-12-19 Ralf Corsepius * optman/Makefile.am: Add multilib support. * src/Makefile.am: Add multilib support. --- c/src/exec/sapi/ChangeLog | 5 +++++ c/src/exec/sapi/optman/Makefile.am | 6 +++--- c/src/exec/sapi/src/Makefile.am | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) (limited to 'c/src/exec') diff --git a/c/src/exec/sapi/ChangeLog b/c/src/exec/sapi/ChangeLog index e64a906f1b..6209fdfd8f 100644 --- a/c/src/exec/sapi/ChangeLog +++ b/c/src/exec/sapi/ChangeLog @@ -1,3 +1,8 @@ +2001-12-19 Ralf Corsepius + + * optman/Makefile.am: Add multilib support. + * src/Makefile.am: Add multilib support. + 2001-10-16 Chris Johns * include/confdefs.h, include/rtems/config.h, include/rtems/io.h, diff --git a/c/src/exec/sapi/optman/Makefile.am b/c/src/exec/sapi/optman/Makefile.am index 514c97a132..2c12d729ec 100644 --- a/c/src/exec/sapi/optman/Makefile.am +++ b/c/src/exec/sapi/optman/Makefile.am @@ -12,14 +12,14 @@ PGMS = $(C_FILES:%.c=$(ARCH)/%.rel) ## FIXME: Is this used anywhere? ASM4FLAGS = -I$(PROJECT_INCLUDE)/rtems -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 TMPINSTALL_FILES += \ - $(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel) + $(C_FILES:%.c=$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/%$(LIB_VARIANT).rel) -$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel +$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/%$(LIB_VARIANT).rel: $(ARCH)/%.rel $(INSTALL_DATA) $< $@ # diff --git a/c/src/exec/sapi/src/Makefile.am b/c/src/exec/sapi/src/Makefile.am index b0bd6d78fe..d71c0e11f7 100644 --- a/c/src/exec/sapi/src/Makefile.am +++ b/c/src/exec/sapi/src/Makefile.am @@ -10,7 +10,7 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) OBJS = $(C_O_FILES) -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 -- cgit v1.2.3