From cee4b8a92cbfa525de0a61871584467342dc82bc Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 07:34:04 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * clock/Makefile.am: Cosmetics. * console/Makefile.am: Cosmetics. * fatal/Makefile.am: Cosmetics. * network/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * timer/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/m68k/mvme167/ChangeLog | 11 +++++++++++ c/src/lib/libbsp/m68k/mvme167/Makefile.am | 16 ++++++++-------- c/src/lib/libbsp/m68k/mvme167/clock/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme167/console/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme167/fatal/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme167/network/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme167/startup/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme167/timer/Makefile.am | 1 - c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.am | 7 ++++--- 9 files changed, 23 insertions(+), 17 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index 6261689109..a6073ef4b0 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog @@ -1,3 +1,14 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * fatal/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/mvme167/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/Makefile.am index 16362f7b0c..4f7298d3f2 100644 --- a/c/src/lib/libbsp/m68k/mvme167/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/Makefile.am @@ -21,20 +21,20 @@ all: $(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)/page_table.h: include/page_table.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/page_table.h: include/page_table.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/page_table.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/page_table.h -$(PROJECT_INCLUDE)/fatal.h: include/fatal.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/fatal.h: include/fatal.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/fatal.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/fatal.h -$(PROJECT_INCLUDE)/mvme16x_hw.h: $(top_srcdir)/../shared/mvme/mvme16x_hw.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/mvme16x_hw.h: $(top_srcdir)/../shared/mvme/mvme16x_hw.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h include $(top_srcdir)/../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/m68k/mvme167/clock/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/clock/Makefile.am index 499a664bbb..01bde7b3e4 100644 --- a/c/src/lib/libbsp/m68k/mvme167/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = ckinit.c diff --git a/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am index 82ad0bb172..db2b7a0d6d 100644 --- a/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c diff --git a/c/src/lib/libbsp/m68k/mvme167/fatal/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/fatal/Makefile.am index df13ef7a69..a62877bb2c 100644 --- a/c/src/lib/libbsp/m68k/mvme167/fatal/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/fatal/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/fatal.rel C_FILES = bspfatal.c diff --git a/c/src/lib/libbsp/m68k/mvme167/network/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/network/Makefile.am index 6adb48797c..35260c6e8f 100644 --- a/c/src/lib/libbsp/m68k/mvme167/network/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/network/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/network.rel C_FILES = network.c diff --git a/c/src/lib/libbsp/m68k/mvme167/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/startup/Makefile.am index aa9653688c..cebe3dccfe 100644 --- a/c/src/lib/libbsp/m68k/mvme167/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/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/mvme167/timer/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/timer/Makefile.am index e70c4770b2..88f8b2ff5b 100644 --- a/c/src/lib/libbsp/m68k/mvme167/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/timer/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/timer.rel C_FILES = timer.c diff --git a/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.am index dfd6f8d227..25d7e68a3e 100644 --- a/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/wrapup/Makefile.am @@ -10,9 +10,10 @@ endif BSP_PIECES = clock console fatal startup 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/*/$(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/*/$(ARCH)/*.$(OBJEXT)) $(wildcard \ + ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3