From ab98fac8c407da54a98eb7379d30a599ef619eba Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 07:33:53 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * clock/Makefile.am: Cosmetics. * console/Makefile.am: Cosmetics. * shmsupp/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * timer/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/m68k/mvme136/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/m68k/mvme136/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme136/clock/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme136/console/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme136/startup/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme136/timer/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am | 7 ++++--- c/src/lib/libbsp/m68k/mvme147s/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/m68k/mvme147s/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme147s/console/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am | 7 ++++--- 16 files changed, 32 insertions(+), 20 deletions(-) diff --git a/c/src/lib/libbsp/m68k/mvme136/ChangeLog b/c/src/lib/libbsp/m68k/mvme136/ChangeLog index 5998daf927..2bc56b91aa 100644 --- a/c/src/lib/libbsp/m68k/mvme136/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme136/ChangeLog @@ -1,3 +1,13 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * shmsupp/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/m68k/mvme136/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/Makefile.am index 20499c1135..8745a414cb 100644 --- a/c/src/lib/libbsp/m68k/mvme136/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/Makefile.am @@ -16,8 +16,8 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = times -$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/coverhd.h: 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/m68k/mvme136/clock/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/clock/Makefile.am index 499a664bbb..01bde7b3e4 100644 --- a/c/src/lib/libbsp/m68k/mvme136/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = ckinit.c diff --git a/c/src/lib/libbsp/m68k/mvme136/console/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/console/Makefile.am index 0d451d4e79..9f4fde7145 100644 --- a/c/src/lib/libbsp/m68k/mvme136/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c diff --git a/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am index 837e1a81e3..313a0f3b99 100644 --- a/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/shmsupp/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/shmsupp.rel C_FILES = addrconv.c getcfg.c lock.c mpisr.c diff --git a/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.am index 5ab6f2e164..3817eec220 100644 --- a/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/startup/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel diff --git a/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.am index e70c4770b2..88f8b2ff5b 100644 --- a/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am index 503a30c546..4ec222828e 100644 --- a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.am @@ -16,9 +16,10 @@ endif 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), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ - $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) $(foreach \ + piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a # diff --git a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog index c5bea689a4..8ae4e0a182 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147s/ChangeLog @@ -1,3 +1,13 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * shmsupp/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/m68k/mvme147s/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am index 6fdc25b060..0af653b94f 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/Makefile.am @@ -16,8 +16,8 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = times -$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/coverhd.h: 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/m68k/mvme147s/clock/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.am index 3f4bb05345..d3fad950e4 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../mvme147/clock PGM = $(ARCH)/clock.rel diff --git a/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.am index 2de9b9b4b7..4055f2701d 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../mvme147/console PGM = $(ARCH)/console.rel diff --git a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am index 837e1a81e3..313a0f3b99 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/shmsupp/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/shmsupp.rel C_FILES = addrconv.c getcfg.c lock.c mpisr.c diff --git a/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am index 149fb28d7a..d3e281aa97 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/startup/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../mvme147/startup:@srcdir@/../../shared:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel diff --git a/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.am index 0d8637f8c2..d4025e8748 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../mvme147/timer PGM = $(ARCH)/timer.rel diff --git a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am index 503a30c546..4ec222828e 100644 --- a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.am @@ -16,9 +16,10 @@ endif 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), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) \ - $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) $(foreach \ + piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a # -- cgit v1.2.3