From e78e7be463111ce5defc8f386173e69fa4f4d465 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 20 Jan 2004 03:03:47 +0000 Subject: 2004-01-20 Ralf Corsepius * Makefile.am: Remove non-existing file "times" from EXTRA_DIST. * startup/Makefile.am: Remove non-existing files setvec.c, bspclean.c, exit.c from EXTRA_DIST. * timer/Makefile.am: Remove non-existing file timer.c from EXTRA_DIST. * wrapup/Makefile.am: Reflect changes to libcpu. --- c/src/lib/libbsp/m68k/sim68000/ChangeLog | 8 ++++++++ c/src/lib/libbsp/m68k/sim68000/Makefile.am | 2 -- c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am | 2 +- c/src/lib/libbsp/m68k/sim68000/timer/Makefile.am | 2 -- c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am | 8 ++------ 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog index f7e1edd4c4..95b5bff99d 100644 --- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog +++ b/c/src/lib/libbsp/m68k/sim68000/ChangeLog @@ -1,3 +1,11 @@ +2004-01-20 Ralf Corsepius + + * Makefile.am: Remove non-existing file "times" from EXTRA_DIST. + * startup/Makefile.am: Remove non-existing files setvec.c, + bspclean.c, exit.c from EXTRA_DIST. + * timer/Makefile.am: Remove non-existing file timer.c from 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/m68k/sim68000/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/Makefile.am index 4ef78f9a70..2fa677311e 100644 --- a/c/src/lib/libbsp/m68k/sim68000/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/Makefile.am @@ -13,8 +13,6 @@ SUBDIRS = . startup clock console timer wrapup nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h -EXTRA_DIST = times - S_FILES = start/start.S $(ARCH)/%$(LIB_VARIANT).$(OBJEXT): start/start.S $(ARCH)/$(dirstamp) $(CCASCOMPILE) -DASM -o $@ -c $< diff --git a/c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am index 65b5f818be..cb19ab3fea 100644 --- a/c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am @@ -29,7 +29,7 @@ project_lib_DATA = linkcmds all-local: $(PGM) $(TMPINSTALL_FILES) -EXTRA_DIST = bspclean.c bspstart.c exit.c linkcmds setvec.c +EXTRA_DIST = bspstart.c linkcmds TMPINSTALL_FILES = diff --git a/c/src/lib/libbsp/m68k/sim68000/timer/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/timer/Makefile.am index 8ec4b5ca6a..fdc610a80a 100644 --- a/c/src/lib/libbsp/m68k/sim68000/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/timer/Makefile.am @@ -27,6 +27,4 @@ all-local: $(OBJS) $(PGM) .PRECIOUS: $(PGM) -EXTRA_DIST = timer.c - include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am index 93a1f21403..d4f92ac1f7 100644 --- a/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am @@ -9,12 +9,8 @@ include $(top_srcdir)/../../../../automake/lib.am # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_FILES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) \ - $(foreach piece, $(GENERIC_FILES), \ - ../../../$(piece)/$(ARCH)/$(piece).rel) + ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel $(ARCH)/libbsp.a: ${OBJS} $(make-library) -- cgit v1.2.3