diff options
Diffstat (limited to 'c/src/exec/score/cpu/arm')
| -rw-r--r-- | c/src/exec/score/cpu/arm/ChangeLog | 4 | ||||
| -rw-r--r-- | c/src/exec/score/cpu/arm/Makefile.am | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/c/src/exec/score/cpu/arm/ChangeLog b/c/src/exec/score/cpu/arm/ChangeLog index 2d6bc09f1b..b1d61ae90d 100644 --- a/c/src/exec/score/cpu/arm/ChangeLog +++ b/c/src/exec/score/cpu/arm/ChangeLog @@ -1,3 +1,7 @@ +2001-12-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Add multilib support. + 2001-12-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * asm.h: include cpuopts.h instead of targopts.h diff --git a/c/src/exec/score/cpu/arm/Makefile.am b/c/src/exec/score/cpu/arm/Makefile.am index 7a0d6f9c98..793fcebfea 100644 --- a/c/src/exec/score/cpu/arm/Makefile.am +++ b/c/src/exec/score/cpu/arm/Makefile.am @@ -19,7 +19,7 @@ REL = $(ARCH)/rtems-cpu.rel rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_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 @@ -29,7 +29,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): $(rtems_cpu_rel_OBJECTS) @@ -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: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) \ $(TMPINSTALL_FILES) |