From 7bf622e73458681ca9c0b8fa4c219eea312d611b Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 07:33:25 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * clock/Makefile.am: Cosmetics. * console/Makefile.am: Cosmetics. * network/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * timer/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/m68k/gen68302/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/m68k/gen68302/Makefile.am | 8 ++++---- c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am | 1 - c/src/lib/libbsp/m68k/gen68302/console/Makefile.am | 1 - c/src/lib/libbsp/m68k/gen68302/network/Makefile.am | 1 - c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am | 1 - c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am | 1 - c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am | 5 +++-- c/src/lib/libbsp/m68k/gen68360/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/m68k/gen68360/Makefile.am | 4 ++-- c/src/lib/libbsp/m68k/gen68360/clock/Makefile.am | 1 - c/src/lib/libbsp/m68k/gen68360/console/Makefile.am | 1 - c/src/lib/libbsp/m68k/gen68360/network/Makefile.am | 1 - c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am | 1 - c/src/lib/libbsp/m68k/gen68360/timer/Makefile.am | 1 - c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am | 8 +++++--- 16 files changed, 34 insertions(+), 21 deletions(-) (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/m68k/gen68302/ChangeLog b/c/src/lib/libbsp/m68k/gen68302/ChangeLog index 81b00d1714..1b725446ec 100644 --- a/c/src/lib/libbsp/m68k/gen68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68302/ChangeLog @@ -1,3 +1,13 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * network/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/gen68302/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/Makefile.am index 3c1c64f5e4..a886aa82ff 100644 --- a/c/src/lib/libbsp/m68k/gen68302/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/Makefile.am @@ -17,12 +17,12 @@ 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)/m302_int.h: include/m302_int.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/m302_int.h: include/m302_int.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/m302_int.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/m302_int.h include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am index 499a664bbb..01bde7b3e4 100644 --- a/c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = ckinit.c diff --git a/c/src/lib/libbsp/m68k/gen68302/console/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/console/Makefile.am index 0d451d4e79..9f4fde7145 100644 --- a/c/src/lib/libbsp/m68k/gen68302/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c diff --git a/c/src/lib/libbsp/m68k/gen68302/network/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/network/Makefile.am index 6adb48797c..35260c6e8f 100644 --- a/c/src/lib/libbsp/m68k/gen68302/network/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/network/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/network.rel C_FILES = network.c diff --git a/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am index 5ab6f2e164..3817eec220 100644 --- a/c/src/lib/libbsp/m68k/gen68302/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/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/gen68302/timer/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am index e70c4770b2..88f8b2ff5b 100644 --- a/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am index 248f873938..fadcd71038 100644 --- a/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68302/wrapup/Makefile.am @@ -10,8 +10,9 @@ endif 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), $(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/gen68360/ChangeLog b/c/src/lib/libbsp/m68k/gen68360/ChangeLog index 059fdf1c45..9027dec26f 100644 --- a/c/src/lib/libbsp/m68k/gen68360/ChangeLog +++ b/c/src/lib/libbsp/m68k/gen68360/ChangeLog @@ -1,3 +1,13 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * network/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/gen68360/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/Makefile.am index 0e0a3a5e30..d770a39727 100644 --- a/c/src/lib/libbsp/m68k/gen68360/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/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/gen68360/clock/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/clock/Makefile.am index 4087d450b2..29e4a74073 100644 --- a/c/src/lib/libbsp/m68k/gen68360/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = clock.c diff --git a/c/src/lib/libbsp/m68k/gen68360/console/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/console/Makefile.am index 8b85faea16..27540e2ab8 100644 --- a/c/src/lib/libbsp/m68k/gen68360/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c consolereserveresources.c diff --git a/c/src/lib/libbsp/m68k/gen68360/network/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/network/Makefile.am index 6adb48797c..35260c6e8f 100644 --- a/c/src/lib/libbsp/m68k/gen68360/network/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/network/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/network.rel C_FILES = network.c diff --git a/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am index ce6fab47d0..92f9804ba5 100644 --- a/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/startup/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared:@srcdir@/../../shared/gdbstub::@srcdir@/../../../shared/gdbstub PGM = $(ARCH)/startup.rel diff --git a/c/src/lib/libbsp/m68k/gen68360/timer/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/timer/Makefile.am index 607ab5a1f9..89cd2f36f3 100644 --- a/c/src/lib/libbsp/m68k/gen68360/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am index 02bc18a817..f74c3a9b7f 100644 --- a/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68360/wrapup/Makefile.am @@ -10,9 +10,11 @@ endif 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), $(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 -- cgit v1.2.3