From 063f208b12a97da5a376f521c4623f83a18a9d7b Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 15:48:54 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * console/Makefile.am: Cosmetics. * scitab/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/sh/gensh1/ChangeLog | 8 ++++++++ c/src/lib/libbsp/sh/gensh1/Makefile.am | 4 ++-- c/src/lib/libbsp/sh/gensh1/console/Makefile.am | 1 - c/src/lib/libbsp/sh/gensh1/scitab/Makefile.am | 1 - c/src/lib/libbsp/sh/gensh1/startup/Makefile.am | 1 - c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am | 5 +++-- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog index 67ab1b2890..a02f43cc00 100644 --- a/c/src/lib/libbsp/sh/gensh1/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh1/ChangeLog @@ -1,3 +1,11 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * console/Makefile.am: Cosmetics. + * scitab/Makefile.am: Cosmetics. + * startup/Makefile.am: Cosmetics. + * wrapup/Makefile.am: Cosmetics. + 2003-12-02 Ralf Corsepius * console/Makefile.am: Remove all-local: $(ARCH). diff --git a/c/src/lib/libbsp/sh/gensh1/Makefile.am b/c/src/lib/libbsp/sh/gensh1/Makefile.am index 0d7bbc2ef9..1f7a6f0d18 100644 --- a/c/src/lib/libbsp/sh/gensh1/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/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/sh/gensh1/console/Makefile.am b/c/src/lib/libbsp/sh/gensh1/console/Makefile.am index 6bc20389e6..b6258c9ce8 100644 --- a/c/src/lib/libbsp/sh/gensh1/console/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared PGM = $(ARCH)/console.rel diff --git a/c/src/lib/libbsp/sh/gensh1/scitab/Makefile.am b/c/src/lib/libbsp/sh/gensh1/scitab/Makefile.am index 0d546d799b..c42125de77 100644 --- a/c/src/lib/libbsp/sh/gensh1/scitab/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/scitab/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/scitab.rel C_FILES = scitab.c diff --git a/c/src/lib/libbsp/sh/gensh1/startup/Makefile.am b/c/src/lib/libbsp/sh/gensh1/startup/Makefile.am index 53e40dd5f1..3b6aa640b8 100644 --- a/c/src/lib/libbsp/sh/gensh1/startup/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/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/sh/gensh1/wrapup/Makefile.am b/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am index 717293414b..e2c8ea399b 100644 --- a/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am @@ -10,8 +10,9 @@ BSP_PIECES = startup scitab console CPU_PIECES = clock timer sci delay score # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \ - $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/$(piece).rel) +OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \ + ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(foreach piece, $(CPU_PIECES), \ + ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3