From d4ee0ce699ef942719b69215922e7d1e7a9dd6a7 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 07:34:16 +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/m68k/gen68340/ChangeLog | 9 ++++++++ c/src/lib/libbsp/m68k/gen68340/Makefile.am | 24 +++++++++++----------- c/src/lib/libbsp/m68k/gen68340/clock/Makefile.am | 1 - c/src/lib/libbsp/m68k/gen68340/console/Makefile.am | 1 - c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am | 1 - c/src/lib/libbsp/m68k/gen68340/timer/Makefile.am | 1 - c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am | 8 +++++--- c/src/lib/libbsp/m68k/idp/ChangeLog | 9 ++++++++ c/src/lib/libbsp/m68k/idp/Makefile.am | 8 ++++---- c/src/lib/libbsp/m68k/idp/clock/Makefile.am | 1 - c/src/lib/libbsp/m68k/idp/console/Makefile.am | 1 - c/src/lib/libbsp/m68k/idp/startup/Makefile.am | 1 - c/src/lib/libbsp/m68k/idp/timer/Makefile.am | 1 - c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am | 5 +++-- c/src/lib/libbsp/m68k/mvme147/ChangeLog | 9 ++++++++ c/src/lib/libbsp/m68k/mvme147/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/mvme147/clock/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme147/console/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme147/startup/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme147/timer/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am | 5 +++-- c/src/lib/libbsp/m68k/ods68302/ChangeLog | 9 ++++++++ c/src/lib/libbsp/m68k/ods68302/Makefile.am | 20 +++++++++--------- c/src/lib/libbsp/m68k/ods68302/clock/Makefile.am | 1 - c/src/lib/libbsp/m68k/ods68302/console/Makefile.am | 1 - c/src/lib/libbsp/m68k/ods68302/startup/Makefile.am | 1 - c/src/lib/libbsp/m68k/ods68302/timer/Makefile.am | 1 - c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am | 5 +++-- c/src/lib/libbsp/m68k/sim68000/ChangeLog | 9 ++++++++ c/src/lib/libbsp/m68k/sim68000/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/sim68000/clock/Makefile.am | 1 - c/src/lib/libbsp/m68k/sim68000/console/Makefile.am | 1 - c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am | 1 - c/src/lib/libbsp/m68k/sim68000/timer/Makefile.am | 1 - c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am | 11 ++++++---- 35 files changed, 96 insertions(+), 63 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/m68k/gen68340/ChangeLog b/c/src/lib/libbsp/m68k/gen68340/ChangeLog index 38a308f881..0c8b0085fd 100644 --- a/c/src/lib/libbsp/m68k/gen68340/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68340/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/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index 698e4faf69..59c7662fb4 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am @@ -21,28 +21,28 @@ 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 -$(PROJECT_INCLUDE)/m340uart.h: include/m340uart.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/m340uart.h: include/m340uart.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m340uart.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/m340uart.h -$(PROJECT_INCLUDE)/m340timer.h: include/m340timer.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/m340timer.h: include/m340timer.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m340timer.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/m340timer.h -$(PROJECT_INCLUDE)/m68340.h: include/m68340.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/m68340.h: include/m68340.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68340.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68340.h -$(PROJECT_INCLUDE)/m68340.inc: include/m68340.inc - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/m68340.inc: include/m68340.inc $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68340.inc PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68340.inc -$(PROJECT_INCLUDE)/m68349.inc: include/m68349.inc - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/m68349.inc: include/m68349.inc $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68349.inc PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68349.inc include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/gen68340/clock/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/clock/Makefile.am index 499a664bbb..01bde7b3e4 100644 --- a/c/src/lib/libbsp/m68k/gen68340/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = ckinit.c diff --git a/c/src/lib/libbsp/m68k/gen68340/console/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/console/Makefile.am index 3999f0a713..4cd4062689 100644 --- a/c/src/lib/libbsp/m68k/gen68340/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c m340uart.c diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am index cbe83efdc0..1fd7eb2dae 100644 --- a/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/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/gen68340/timer/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/timer/Makefile.am index 607ab5a1f9..89cd2f36f3 100644 --- a/c/src/lib/libbsp/m68k/gen68340/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am index 4da1bb0813..925d05c3e2 100644 --- a/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am @@ -5,9 +5,11 @@ BSP_PIECES = startup clock console timer # 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/misc/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) \ + $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) LIB = $(ARCH)/libbsp.a include $(top_srcdir)/../../../../automake/compile.am diff --git a/c/src/lib/libbsp/m68k/idp/ChangeLog b/c/src/lib/libbsp/m68k/idp/ChangeLog index fd7911fcbb..741cd60538 100644 --- a/c/src/lib/libbsp/m68k/idp/ChangeLog +++ b/c/src/lib/libbsp/m68k/idp/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/m68k/idp/Makefile.am b/c/src/lib/libbsp/m68k/idp/Makefile.am index 8cd747777c..e5805b0b94 100644 --- a/c/src/lib/libbsp/m68k/idp/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/Makefile.am @@ -18,12 +18,12 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = include/README EXTRA_DIST += times -$(PROJECT_INCLUDE)/leds.h: include/leds.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/leds.h: include/leds.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/leds.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/leds.h -$(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/m68k/idp/clock/Makefile.am b/c/src/lib/libbsp/m68k/idp/clock/Makefile.am index 499a664bbb..01bde7b3e4 100644 --- a/c/src/lib/libbsp/m68k/idp/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = ckinit.c diff --git a/c/src/lib/libbsp/m68k/idp/console/Makefile.am b/c/src/lib/libbsp/m68k/idp/console/Makefile.am index 4bd5d99367..b635621c55 100644 --- a/c/src/lib/libbsp/m68k/idp/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c leds.c mc68ec.c duart.c diff --git a/c/src/lib/libbsp/m68k/idp/startup/Makefile.am b/c/src/lib/libbsp/m68k/idp/startup/Makefile.am index 19eb76875f..d45753c799 100644 --- a/c/src/lib/libbsp/m68k/idp/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/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/idp/timer/Makefile.am b/c/src/lib/libbsp/m68k/idp/timer/Makefile.am index e70c4770b2..88f8b2ff5b 100644 --- a/c/src/lib/libbsp/m68k/idp/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am index ff781b0c65..1e0728d2fe 100644 --- a/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/idp/wrapup/Makefile.am @@ -5,8 +5,9 @@ BSP_PIECES = startup clock console timer # 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)) +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a include $(top_srcdir)/../../../../automake/compile.am diff --git a/c/src/lib/libbsp/m68k/mvme147/ChangeLog b/c/src/lib/libbsp/m68k/mvme147/ChangeLog index 125edddf9c..8a7e57218c 100644 --- a/c/src/lib/libbsp/m68k/mvme147/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme147/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/m68k/mvme147/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/Makefile.am index 4f0aa9447d..fde4b0aeb1 100644 --- a/c/src/lib/libbsp/m68k/mvme147/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/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/mvme147/clock/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/clock/Makefile.am index 499a664bbb..01bde7b3e4 100644 --- a/c/src/lib/libbsp/m68k/mvme147/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = ckinit.c diff --git a/c/src/lib/libbsp/m68k/mvme147/console/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/console/Makefile.am index 0d451d4e79..9f4fde7145 100644 --- a/c/src/lib/libbsp/m68k/mvme147/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c diff --git a/c/src/lib/libbsp/m68k/mvme147/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/startup/Makefile.am index 5ab6f2e164..3817eec220 100644 --- a/c/src/lib/libbsp/m68k/mvme147/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/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/mvme147/timer/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/timer/Makefile.am index e70c4770b2..88f8b2ff5b 100644 --- a/c/src/lib/libbsp/m68k/mvme147/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am index ff781b0c65..1e0728d2fe 100644 --- a/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.am @@ -5,8 +5,9 @@ BSP_PIECES = startup clock console timer # 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)) +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a include $(top_srcdir)/../../../../automake/compile.am diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog index b7da7623d9..ec171065b9 100644 --- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/ods68302/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/m68k/ods68302/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/Makefile.am index 5c95ecd31f..3dfd07dd28 100644 --- a/c/src/lib/libbsp/m68k/ods68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/Makefile.am @@ -20,24 +20,24 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = times -$(PROJECT_INCLUDE)/bare.h: include/bare.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/bare.h: include/bare.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bare.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bare.h -$(PROJECT_INCLUDE)/crc.h: include/crc.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/crc.h: include/crc.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/crc.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/crc.h -$(PROJECT_INCLUDE)/debugport.h: include/debugport.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/debugport.h: include/debugport.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/debugport.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/debugport.h -$(PROJECT_INCLUDE)/m68302scc.h: include/m68302scc.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/m68302scc.h: include/m68302scc.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m68302scc.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68302scc.h -$(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/ods68302/clock/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/clock/Makefile.am index 499a664bbb..01bde7b3e4 100644 --- a/c/src/lib/libbsp/m68k/ods68302/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = ckinit.c diff --git a/c/src/lib/libbsp/m68k/ods68302/console/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/console/Makefile.am index 0d451d4e79..9f4fde7145 100644 --- a/c/src/lib/libbsp/m68k/ods68302/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c diff --git a/c/src/lib/libbsp/m68k/ods68302/startup/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/startup/Makefile.am index 02a4389648..3071cdd01d 100644 --- a/c/src/lib/libbsp/m68k/ods68302/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/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/ods68302/timer/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/timer/Makefile.am index e70c4770b2..88f8b2ff5b 100644 --- a/c/src/lib/libbsp/m68k/ods68302/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am index 8793f2392f..6c52ec02a0 100644 --- a/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/wrapup/Makefile.am @@ -5,8 +5,9 @@ BSP_PIECES = startup clock console timer # 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/misc/$(ARCH)/*.$(OBJEXT)) +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) LIB = $(ARCH)/libbsp.a include $(top_srcdir)/../../../../automake/compile.am diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog index e06d8ca203..905f08e16f 100644 --- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog +++ b/c/src/lib/libbsp/m68k/sim68000/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/m68k/sim68000/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/Makefile.am index 8266588bbe..0a35cb214e 100644 --- a/c/src/lib/libbsp/m68k/sim68000/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/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/m68k/sim68000/clock/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/clock/Makefile.am index 04af1f7136..e35b2fe3fa 100644 --- a/c/src/lib/libbsp/m68k/sim68000/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/clock.rel diff --git a/c/src/lib/libbsp/m68k/sim68000/console/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/console/Makefile.am index 8ba10d089f..a070588fa5 100644 --- a/c/src/lib/libbsp/m68k/sim68000/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/console.rel diff --git a/c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am index 5c04862ed7..f0f983c2e3 100644 --- a/c/src/lib/libbsp/m68k/sim68000/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/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/sim68000/timer/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/timer/Makefile.am index c247d386bb..8ec4b5ca6a 100644 --- a/c/src/lib/libbsp/m68k/sim68000/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/timer.rel diff --git a/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am index 5c0b400663..c2ba8c6c7f 100644 --- a/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/wrapup/Makefile.am @@ -8,10 +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)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT)) \ - $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) \ - $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel) +OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \ + ../$(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) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3