summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-01-17 05:52:43 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-01-17 05:52:43 +0000
commit5fe9ac617d04abb6e413e6b2006ff87a5253ea47 (patch)
tree2dfdec096b01b69c69f598ab7ba4c857c66f5efa /c
parent2004-01-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-5fe9ac617d04abb6e413e6b2006ff87a5253ea47.tar.bz2
2004-01-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* startup/Makefile.am: Remove bogus EXTRA_DIST. * timer/Makefile.am: Remove bogus EXTRA_DIST. * wrapup/Makefile.am: Reflect changes to libcpu.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libbsp/sh/simsh4/ChangeLog6
-rw-r--r--c/src/lib/libbsp/sh/simsh4/startup/Makefile.am3
-rw-r--r--c/src/lib/libbsp/sh/simsh4/timer/Makefile.am2
-rw-r--r--c/src/lib/libbsp/sh/simsh4/wrapup/Makefile.am2
4 files changed, 9 insertions, 4 deletions
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 <corsepiu@faw.uni-ulm.de>
+
+ * 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 <corsepiu@faw.uni-ulm.de>
* 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