From 914d5ea2ecb792cd3d54d633346bceef30898ee2 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 07:33:39 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * clock/Makefile.am: Cosmetics. * console/Makefile.am: Cosmetics. * spurious/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * timer/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/m68k/dmv152/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/m68k/dmv152/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/dmv152/clock/Makefile.am | 1 - c/src/lib/libbsp/m68k/dmv152/console/Makefile.am | 1 - c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.am | 1 - c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am | 1 - c/src/lib/libbsp/m68k/dmv152/timer/Makefile.am | 1 - c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am | 5 +++-- c/src/lib/libbsp/m68k/efi68k/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/m68k/efi68k/Makefile.am | 16 ++++++++-------- c/src/lib/libbsp/m68k/efi68k/clock/Makefile.am | 1 - c/src/lib/libbsp/m68k/efi68k/console/Makefile.am | 1 - c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.am | 1 - c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am | 1 - c/src/lib/libbsp/m68k/efi68k/timer/Makefile.am | 1 - c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am | 5 +++-- c/src/lib/libbsp/m68k/mrm332/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/m68k/mrm332/Makefile.am | 8 ++++---- c/src/lib/libbsp/m68k/mrm332/clock/Makefile.am | 1 - c/src/lib/libbsp/m68k/mrm332/console/Makefile.am | 1 - c/src/lib/libbsp/m68k/mrm332/spurious/Makefile.am | 1 - c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am | 1 - c/src/lib/libbsp/m68k/mrm332/timer/Makefile.am | 1 - c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am | 5 +++-- 24 files changed, 53 insertions(+), 35 deletions(-) diff --git a/c/src/lib/libbsp/m68k/dmv152/ChangeLog b/c/src/lib/libbsp/m68k/dmv152/ChangeLog index 095641b881..defa0d118a 100644 --- a/c/src/lib/libbsp/m68k/dmv152/ChangeLog +++ b/c/src/lib/libbsp/m68k/dmv152/ChangeLog @@ -1,3 +1,13 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * spurious/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/dmv152/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/Makefile.am index 4af04fef0a..f058784cc3 100644 --- a/c/src/lib/libbsp/m68k/dmv152/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/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/dmv152/clock/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/clock/Makefile.am index 499a664bbb..01bde7b3e4 100644 --- a/c/src/lib/libbsp/m68k/dmv152/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = ckinit.c diff --git a/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am index d914f7fb84..9f26fc9f2a 100644 --- a/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c diff --git a/c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.am index a5cf5fccac..265ed15700 100644 --- a/c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/spurious/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/spurious.rel C_FILES = spinit.c diff --git a/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am index b24fcff921..3f09660ef8 100644 --- a/c/src/lib/libbsp/m68k/dmv152/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/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/dmv152/timer/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/timer/Makefile.am index e70c4770b2..88f8b2ff5b 100644 --- a/c/src/lib/libbsp/m68k/dmv152/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am index 6e42c9270b..15833e5d71 100644 --- a/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/dmv152/wrapup/Makefile.am @@ -5,8 +5,9 @@ BSP_PIECES = startup clock console spurious 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/efi68k/ChangeLog b/c/src/lib/libbsp/m68k/efi68k/ChangeLog index fa8b2cbb43..9e580da898 100644 --- a/c/src/lib/libbsp/m68k/efi68k/ChangeLog +++ b/c/src/lib/libbsp/m68k/efi68k/ChangeLog @@ -1,3 +1,13 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * spurious/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/efi68k/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/Makefile.am index 653f90480e..40f9c86aa4 100644 --- a/c/src/lib/libbsp/m68k/efi68k/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/Makefile.am @@ -19,20 +19,20 @@ 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 -$(PROJECT_INCLUDE)/efi68k.h: include/efi68k.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/efi68k.h: include/efi68k.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/efi68k.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/efi68k.h -$(PROJECT_INCLUDE)/16550.h: include/16550.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/16550.h: include/16550.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/16550.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/16550.h -$(PROJECT_INCLUDE)/DP8570A.h: include/DP8570A.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/DP8570A.h: include/DP8570A.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/DP8570A.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/DP8570A.h include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/efi68k/clock/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/clock/Makefile.am index 499a664bbb..01bde7b3e4 100644 --- a/c/src/lib/libbsp/m68k/efi68k/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = ckinit.c diff --git a/c/src/lib/libbsp/m68k/efi68k/console/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/console/Makefile.am index 0d451d4e79..9f4fde7145 100644 --- a/c/src/lib/libbsp/m68k/efi68k/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c diff --git a/c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.am index a5cf5fccac..265ed15700 100644 --- a/c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/spurious/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/spurious.rel C_FILES = spinit.c diff --git a/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am index f4a86fddbc..9e708f80e3 100644 --- a/c/src/lib/libbsp/m68k/efi68k/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/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/efi68k/timer/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/timer/Makefile.am index 607ab5a1f9..89cd2f36f3 100644 --- a/c/src/lib/libbsp/m68k/efi68k/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am index 8b2b11a3cb..0103f7dbca 100644 --- a/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/efi68k/wrapup/Makefile.am @@ -5,8 +5,9 @@ BSP_PIECES = startup clock console spurious 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/mrm332/ChangeLog b/c/src/lib/libbsp/m68k/mrm332/ChangeLog index 88ca07343f..0c337cda29 100644 --- a/c/src/lib/libbsp/m68k/mrm332/ChangeLog +++ b/c/src/lib/libbsp/m68k/mrm332/ChangeLog @@ -1,3 +1,13 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * spurious/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/mrm332/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/Makefile.am index e8b8b4bdf2..c534772b35 100644 --- a/c/src/lib/libbsp/m68k/mrm332/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/Makefile.am @@ -17,12 +17,12 @@ all-local: $(PREIINSTALL_FILES) EXTRA_DIST = times -$(PROJECT_INCLUDE)/mrm332.h: include/mrm332.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/mrm332.h: include/mrm332.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mrm332.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/mrm332.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/mrm332/clock/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/clock/Makefile.am index 499a664bbb..01bde7b3e4 100644 --- a/c/src/lib/libbsp/m68k/mrm332/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = ckinit.c diff --git a/c/src/lib/libbsp/m68k/mrm332/console/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/console/Makefile.am index 54eb72b9f2..fe039af362 100644 --- a/c/src/lib/libbsp/m68k/mrm332/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c sci.c diff --git a/c/src/lib/libbsp/m68k/mrm332/spurious/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/spurious/Makefile.am index a5cf5fccac..265ed15700 100644 --- a/c/src/lib/libbsp/m68k/mrm332/spurious/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/spurious/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/spurious.rel C_FILES = spinit.c diff --git a/c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am index 3c3c619234..6a2bd1337a 100644 --- a/c/src/lib/libbsp/m68k/mrm332/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/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/mrm332/timer/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/timer/Makefile.am index 607ab5a1f9..89cd2f36f3 100644 --- a/c/src/lib/libbsp/m68k/mrm332/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am index 8b2b11a3cb..0103f7dbca 100644 --- a/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mrm332/wrapup/Makefile.am @@ -5,8 +5,9 @@ BSP_PIECES = startup clock console spurious 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 -- cgit v1.2.3