From c880dc89814a97c9d86146ece47c5137f95599f6 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 20 Jan 2004 03:03:32 +0000 Subject: 2004-01-20 Ralf Corsepius * wrapup/Makefile.am: Reflect changes to libcpu. --- c/src/lib/libbsp/m68k/dmv152/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/gen68302/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/idp/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am | 14 ++++++-------- c/src/lib/libbsp/m68k/mrm332/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme136/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme147/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme147s/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme167/ChangeLog | 4 ++++ c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.am | 6 +++--- 18 files changed, 59 insertions(+), 25 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/m68k/dmv152/ChangeLog b/c/src/lib/libbsp/m68k/dmv152/ChangeLog index 56600098df..e024a71fbc 100644 --- a/c/src/lib/libbsp/m68k/dmv152/ChangeLog +++ b/c/src/lib/libbsp/m68k/dmv152/ChangeLog @@ -1,3 +1,7 @@ +2004-01-20 Ralf Corsepius + + * 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/dmv152/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am index bd78f39afc..643009945e 100644 --- a/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am @@ -6,8 +6,8 @@ BSP_PIECES = startup clock console spurious timer # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) + ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index 3eb6500bdd..2405da4d18 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,7 @@ +2004-01-20 Ralf Corsepius + + * 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/gen68302/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am index f0e4a59e6a..3886742988 100644 --- a/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am @@ -11,8 +11,8 @@ BSP_PIECES = startup clock console timer $(NETWORKING_DRIVER) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) + ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index 9b20fc3980..b5f9389d18 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/ChangeLog @@ -1,3 +1,7 @@ +2004-01-20 Ralf Corsepius + + * 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/idp/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am index 74c43cefb2..4eaae20fce 100644 --- a/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am @@ -6,8 +6,8 @@ BSP_PIECES = startup clock console timer # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) + ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog index c237109fb2..56cd5e6126 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog +++ b/c/src/lib/libbsp/m68k/mcf5206elite/ChangeLog @@ -1,3 +1,7 @@ +2004-01-20 Ralf Corsepius + + * 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/mcf5206elite/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am index d005a8c16e..e384687083 100644 --- a/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mcf5206elite/wrapup/Makefile.am @@ -4,16 +4,14 @@ BSP_PIECES = startup console i2c tod nvram -CPU_PIECES = clock console timer mbus - # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) \ - $(foreach piece, $(CPU_PIECES), \ - ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) + ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel \ + ../../../../libcpu/m68k/mcf5206/clock$(LIB_VARIANT).rel \ + ../../../../libcpu/m68k/mcf5206/console$(LIB_VARIANT).rel \ + ../../../../libcpu/m68k/mcf5206/timer$(LIB_VARIANT).rel \ + ../../../../libcpu/m68k/mcf5206/mbus$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/m68k/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index f718d2b0f3..c8550a7e17 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,7 @@ +2004-01-20 Ralf Corsepius + + * 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/mrm332/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am index 7e923c67cb..643009945e 100644 --- a/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am @@ -6,8 +6,8 @@ BSP_PIECES = startup clock console spurious timer # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) + ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog index 343c83022e..0bdc10fcad 100644 --- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog @@ -1,3 +1,7 @@ +2004-01-20 Ralf Corsepius + + * 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/mvme136/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am index 6a7b5da4fc..8ad5205891 100644 --- a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am @@ -12,8 +12,8 @@ BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) + ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel $(ARCH)/libbsp.a: $(OBJS) $(make-library) diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index 620afcd238..aeec70bfa5 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/ChangeLog @@ -1,3 +1,7 @@ +2004-01-20 Ralf Corsepius + + * 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/mvme147/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am index 74c43cefb2..4eaae20fce 100644 --- a/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am @@ -6,8 +6,8 @@ BSP_PIECES = startup clock console timer # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) + ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am diff --git a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog index f337341053..c3b871e883 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog @@ -1,3 +1,7 @@ +2004-01-20 Ralf Corsepius + + * wrapup/Makefile.am: Reflect changes to libcpu. + 2004-01-14 Ralf Corsepius * start/.cvsignore: Remove. diff --git a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am index 6a7b5da4fc..8ad5205891 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am @@ -12,8 +12,8 @@ BSP_PIECES = startup clock console timer $(BSP_MP_O_PIECES) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) + ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel $(ARCH)/libbsp.a: $(OBJS) $(make-library) diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index 2c94c072d1..6cd15e36c1 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog @@ -1,3 +1,7 @@ +2004-01-20 Ralf Corsepius + + * 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/mvme167/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.am index 4a3a116fe7..2b3967a6c8 100644 --- a/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.am @@ -11,9 +11,9 @@ BSP_PIECES = clock console fatal startup timer $(NETWORKING_DRIVER) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) + ../../../../libcpu/$(RTEMS_CPU)/shared/cache$(LIB_VARIANT).rel \ + ../../../../libcpu/$(RTEMS_CPU)/shared/misc$(LIB_VARIANT).rel \ + ../../../../libcpu/m68k/@RTEMS_CPU_MODEL@/fpsp$(LIB_VARIANT).rel include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am -- cgit v1.2.3