From 63c5ce455d3a18bd1906ee213c7d16a5f32babd8 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 13 Sep 2000 20:03:48 +0000 Subject: 2000-09-13 Joel Sherrill * bsp_specs, console/Makefile.am, include/Makefile.am: Clean up. --- c/src/lib/libbsp/arm/armulator/ChangeLog | 4 ++++ c/src/lib/libbsp/arm/armulator/bsp_specs | 3 +-- c/src/lib/libbsp/arm/armulator/console/Makefile.am | 5 +---- c/src/lib/libbsp/arm/armulator/include/Makefile.am | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog index 92f64eb66c..2cbb792627 100644 --- a/c/src/lib/libbsp/arm/armulator/ChangeLog +++ b/c/src/lib/libbsp/arm/armulator/ChangeLog @@ -1,3 +1,7 @@ +2000-09-13 Joel Sherrill + + * bsp_specs, console/Makefile.am, include/Makefile.am: Clean up. + 2000-09-04 Ralf Corsepius * clock/Makefile.am, console/Makefile.am, start/Makefile.am, diff --git a/c/src/lib/libbsp/arm/armulator/bsp_specs b/c/src/lib/libbsp/arm/armulator/bsp_specs index eecf37c5a0..7071815dc4 100644 --- a/c/src/lib/libbsp/arm/armulator/bsp_specs +++ b/c/src/lib/libbsp/arm/armulator/bsp_specs @@ -19,5 +19,4 @@ %{qrtems_debug: start_g.o%s}} *link: -%(old_link) %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e _start} - +%(old_link) %{!qrtems: %(old_link)} %{qrtems: -dc -dp -T linkcmds%s -N -e _start} diff --git a/c/src/lib/libbsp/arm/armulator/console/Makefile.am b/c/src/lib/libbsp/arm/armulator/console/Makefile.am index 473ee66895..e71b253615 100644 --- a/c/src/lib/libbsp/arm/armulator/console/Makefile.am +++ b/c/src/lib/libbsp/arm/armulator/console/Makefile.am @@ -11,10 +11,7 @@ PGM = $(ARCH)/console.rel C_FILES = console-io.c console-polled.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -S_FILES = -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) - -OBJS = $(C_O_FILES) $(S_O_FILES) +OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am diff --git a/c/src/lib/libbsp/arm/armulator/include/Makefile.am b/c/src/lib/libbsp/arm/armulator/include/Makefile.am index 1d6c3074ec..534884ac59 100644 --- a/c/src/lib/libbsp/arm/armulator/include/Makefile.am +++ b/c/src/lib/libbsp/arm/armulator/include/Makefile.am @@ -9,7 +9,7 @@ H_FILES = bsp.h ../../../shared/include/coverhd.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/bsp.h: bsp.h +$(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ $(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h -- cgit v1.2.3