From 5fe9ac617d04abb6e413e6b2006ff87a5253ea47 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 17 Jan 2004 05:52:43 +0000 Subject: 2004-01-17 Ralf Corsepius * startup/Makefile.am: Remove bogus EXTRA_DIST. * timer/Makefile.am: Remove bogus EXTRA_DIST. * wrapup/Makefile.am: Reflect changes to libcpu. --- c/src/lib/libbsp/sh/simsh4/ChangeLog | 6 ++++++ c/src/lib/libbsp/sh/simsh4/startup/Makefile.am | 3 +-- c/src/lib/libbsp/sh/simsh4/timer/Makefile.am | 2 +- c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/sh/simsh4/ChangeLog b/c/src/lib/libbsp/sh/simsh4/ChangeLog index 568337d295..443bb995f1 100644 --- a/c/src/lib/libbsp/sh/simsh4/ChangeLog +++ b/c/src/lib/libbsp/sh/simsh4/ChangeLog @@ -1,3 +1,9 @@ +2004-01-17 Ralf Corsepius + + * startup/Makefile.am: Remove bogus EXTRA_DIST. + * timer/Makefile.am: Remove bogus EXTRA_DIST. + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-14 Ralf Corsepius * Makefile.am: Re-add dirstamps to PRE/TMPINSTALL_FILES. diff --git a/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am b/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am index 4825a597d1..c5d409afc1 100644 --- a/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am +++ b/c/src/lib/libbsp/sh/simsh4/startup/Makefile.am @@ -26,8 +26,7 @@ $(PGM): $(OBJS) all-local: $(TMPINSTALL_FILES) $(PGM) -EXTRA_DIST = bspclean.c bspstart.c hw_init.c linkcmds linkcmds-le \ - linkcmds-le.coff +EXTRA_DIST = bspstart.c hw_init.c linkcmds linkcmds-le linkcmds-le.coff TMPINSTALL_FILES = diff --git a/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am b/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am index b8936c11d2..1200b62c51 100644 --- a/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am +++ b/c/src/lib/libbsp/sh/simsh4/timer/Makefile.am @@ -27,6 +27,6 @@ all-local: $(OBJS) $(PGM) .PRECIOUS: $(PGM) -EXTRA_DIST = timer.c timerisr.S +EXTRA_DIST = timer.c include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am b/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am index 43b153b863..4174a82f8a 100644 --- a/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am +++ b/c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am @@ -15,7 +15,7 @@ CPU_PIECES = score # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ $(foreach piece, $(CPU_PIECES), \ - ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/$(piece).rel) + ../../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/$(piece)$(LIB_VARIANT).rel) include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am -- cgit v1.2.3