From e9718415b41529cdf8d6b6e3c7f34da4ec5dd4d7 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 19 Dec 2001 14:36:28 +0000 Subject: 2001-12-19 Ralf Corsepius * Makefile.am: Add multilib support. --- c/src/exec/score/cpu/i960/ChangeLog | 4 ++++ c/src/exec/score/cpu/i960/Makefile.am | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'c/src/exec/score/cpu/i960') diff --git a/c/src/exec/score/cpu/i960/ChangeLog b/c/src/exec/score/cpu/i960/ChangeLog index 2811facb54..724271f28f 100644 --- a/c/src/exec/score/cpu/i960/ChangeLog +++ b/c/src/exec/score/cpu/i960/ChangeLog @@ -1,3 +1,7 @@ +2001-12-19 Ralf Corsepius + + * Makefile.am: Add multilib support. + 2001-11-28 Joel Sherrill , This was tracked as PR91. diff --git a/c/src/exec/score/cpu/i960/Makefile.am b/c/src/exec/score/cpu/i960/Makefile.am index 21a6f1748e..1ee5603e2c 100644 --- a/c/src/exec/score/cpu/i960/Makefile.am +++ b/c/src/exec/score/cpu/i960/Makefile.am @@ -15,7 +15,7 @@ include_HEADERS = asm.h S_FILES = cpu_asm.S S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) -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 @@ -25,7 +25,7 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o +$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o $(INSTALL_DATA) $< $@ REL = $(ARCH)/rtems-cpu.rel @@ -37,7 +37,7 @@ $(REL): $(rtems_cpu_rel_OBJECTS) PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/rtems$(LIB_VARIANT).o all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ $(TMPINSTALL_FILES) -- cgit v1.2.3