From 217645c87de3911c704f42293a23c30d93278c05 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 10:57:38 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * clock/Makefile.am: Cosmetics. * console/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * timer/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/mips/genmongoosev/ChangeLog | 9 +++++++++ c/src/lib/libbsp/mips/genmongoosev/Makefile.am | 4 ++-- c/src/lib/libbsp/mips/genmongoosev/clock/Makefile.am | 1 - c/src/lib/libbsp/mips/genmongoosev/console/Makefile.am | 1 - c/src/lib/libbsp/mips/genmongoosev/startup/Makefile.am | 4 ++-- c/src/lib/libbsp/mips/genmongoosev/timer/Makefile.am | 1 - c/src/lib/libbsp/mips/genmongoosev/wrapup/Makefile.am | 13 ++++++++----- c/src/lib/libbsp/mips/jmr3904/ChangeLog | 9 +++++++++ c/src/lib/libbsp/mips/jmr3904/Makefile.am | 4 ++-- c/src/lib/libbsp/mips/jmr3904/clock/Makefile.am | 1 - c/src/lib/libbsp/mips/jmr3904/console/Makefile.am | 1 - c/src/lib/libbsp/mips/jmr3904/startup/Makefile.am | 1 - c/src/lib/libbsp/mips/jmr3904/timer/Makefile.am | 1 - c/src/lib/libbsp/mips/jmr3904/wrapup/Makefile.am | 12 +++++++----- 14 files changed, 39 insertions(+), 23 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/mips/genmongoosev/ChangeLog b/c/src/lib/libbsp/mips/genmongoosev/ChangeLog index c16f51851a..43391d0fa4 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/ChangeLog +++ b/c/src/lib/libbsp/mips/genmongoosev/ChangeLog @@ -1,3 +1,12 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * startup/Makefile.am: Cosmetics. + * timer/Makefile.am: Cosmetics. + * wrapup/Makefile.am: Cosmetics. + 2003-12-02 Ralf Corsepius * clock/Makefile.am: Remove all-local: $(ARCH). diff --git a/c/src/lib/libbsp/mips/genmongoosev/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/Makefile.am index 8266588bbe..0a35cb214e 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/Makefile.am +++ b/c/src/lib/libbsp/mips/genmongoosev/Makefile.am @@ -16,8 +16,8 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = times -$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/mips/genmongoosev/clock/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/clock/Makefile.am index bc273177d9..8100636364 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/clock/Makefile.am +++ b/c/src/lib/libbsp/mips/genmongoosev/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = clockdrv.c diff --git a/c/src/lib/libbsp/mips/genmongoosev/console/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/console/Makefile.am index dc50a39f72..7589081442 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/console/Makefile.am +++ b/c/src/lib/libbsp/mips/genmongoosev/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/console.rel diff --git a/c/src/lib/libbsp/mips/genmongoosev/startup/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/startup/Makefile.am index fb41589df7..57d73643b7 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/startup/Makefile.am +++ b/c/src/lib/libbsp/mips/genmongoosev/startup/Makefile.am @@ -2,13 +2,13 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/gdbstub:@srcdir@/../../../shared/gdbstub PGM = $(ARCH)/startup.rel C_FILES = bspclean.c bsplibc.c bsppost.c bspstart.c bootcard.c main.c sbrk.c \ - gnatinstallhandler.c setvec.c mips-stub.c gdb-support.c rtems-stub-glue.c + gnatinstallhandler.c setvec.c mips-stub.c gdb-support.c \ + rtems-stub-glue.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) OBJS = $(C_O_FILES) diff --git a/c/src/lib/libbsp/mips/genmongoosev/timer/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/timer/Makefile.am index 607ab5a1f9..89cd2f36f3 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/timer/Makefile.am +++ b/c/src/lib/libbsp/mips/genmongoosev/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/mips/genmongoosev/wrapup/Makefile.am b/c/src/lib/libbsp/mips/genmongoosev/wrapup/Makefile.am index 55163cb12a..1a22e491f3 100644 --- a/c/src/lib/libbsp/mips/genmongoosev/wrapup/Makefile.am +++ b/c/src/lib/libbsp/mips/genmongoosev/wrapup/Makefile.am @@ -8,11 +8,14 @@ include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mongoosev/*/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) \ - $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel) +OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/mongoosev/*/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) \ + $(foreach piece, $(GENERIC_FILES), \ + ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a diff --git a/c/src/lib/libbsp/mips/jmr3904/ChangeLog b/c/src/lib/libbsp/mips/jmr3904/ChangeLog index 14dd205acb..1814bcee77 100644 --- a/c/src/lib/libbsp/mips/jmr3904/ChangeLog +++ b/c/src/lib/libbsp/mips/jmr3904/ChangeLog @@ -1,3 +1,12 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * startup/Makefile.am: Cosmetics. + * timer/Makefile.am: Cosmetics. + * wrapup/Makefile.am: Cosmetics. + 2003-12-02 Ralf Corsepius * clock/Makefile.am: Remove all-local: $(ARCH). diff --git a/c/src/lib/libbsp/mips/jmr3904/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/Makefile.am index 8b47a743aa..043c8f68b4 100644 --- a/c/src/lib/libbsp/mips/jmr3904/Makefile.am +++ b/c/src/lib/libbsp/mips/jmr3904/Makefile.am @@ -16,8 +16,8 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = times -$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/mips/jmr3904/clock/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/clock/Makefile.am index 2ea593b4f8..fb7575b504 100644 --- a/c/src/lib/libbsp/mips/jmr3904/clock/Makefile.am +++ b/c/src/lib/libbsp/mips/jmr3904/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = clockdrv.c diff --git a/c/src/lib/libbsp/mips/jmr3904/console/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/console/Makefile.am index c4784cad27..9667c026e9 100644 --- a/c/src/lib/libbsp/mips/jmr3904/console/Makefile.am +++ b/c/src/lib/libbsp/mips/jmr3904/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/console.rel diff --git a/c/src/lib/libbsp/mips/jmr3904/startup/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/startup/Makefile.am index f7b34ee57b..a99ecb0319 100644 --- a/c/src/lib/libbsp/mips/jmr3904/startup/Makefile.am +++ b/c/src/lib/libbsp/mips/jmr3904/startup/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel diff --git a/c/src/lib/libbsp/mips/jmr3904/timer/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/timer/Makefile.am index 607ab5a1f9..89cd2f36f3 100644 --- a/c/src/lib/libbsp/mips/jmr3904/timer/Makefile.am +++ b/c/src/lib/libbsp/mips/jmr3904/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/mips/jmr3904/wrapup/Makefile.am b/c/src/lib/libbsp/mips/jmr3904/wrapup/Makefile.am index d7d7ff7936..7ded219d31 100644 --- a/c/src/lib/libbsp/mips/jmr3904/wrapup/Makefile.am +++ b/c/src/lib/libbsp/mips/jmr3904/wrapup/Makefile.am @@ -8,11 +8,13 @@ include $(top_srcdir)/../../../../automake/compile.am include $(top_srcdir)/../../../../automake/lib.am # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/tx39/*/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) \ - $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel) +OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/tx39/*/$(ARCH)/*.$(OBJEXT)) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) \ + $(foreach piece, $(GENERIC_FILES), \ + ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3