From 70af070b5b243869b3c39046bd2a8a55528ae4d8 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 15:49:06 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * clock/Makefile.am: Cosmetics. * console/Makefile.am: Cosmetics. * gdbsci/Makefile.am: Cosmetics. * scitab/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * trap34/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/sh/shsim/ChangeLog | 11 +++++++++++ c/src/lib/libbsp/sh/shsim/Makefile.am | 8 ++++---- c/src/lib/libbsp/sh/shsim/clock/Makefile.am | 1 - c/src/lib/libbsp/sh/shsim/console/Makefile.am | 1 - c/src/lib/libbsp/sh/shsim/gdbsci/Makefile.am | 1 - c/src/lib/libbsp/sh/shsim/scitab/Makefile.am | 1 - c/src/lib/libbsp/sh/shsim/startup/Makefile.am | 1 - c/src/lib/libbsp/sh/shsim/trap34/Makefile.am | 1 - c/src/lib/libbsp/sh/shsim/wrapup/Makefile.am | 6 +++--- 9 files changed, 18 insertions(+), 13 deletions(-) (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/sh/shsim/ChangeLog b/c/src/lib/libbsp/sh/shsim/ChangeLog index 9826af1e03..2326e5eba7 100644 --- a/c/src/lib/libbsp/sh/shsim/ChangeLog +++ b/c/src/lib/libbsp/sh/shsim/ChangeLog @@ -1,3 +1,14 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * clock/Makefile.am: Cosmetics. + * console/Makefile.am: Cosmetics. + * gdbsci/Makefile.am: Cosmetics. + * scitab/Makefile.am: Cosmetics. + * startup/Makefile.am: Cosmetics. + * trap34/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/sh/shsim/Makefile.am b/c/src/lib/libbsp/sh/shsim/Makefile.am index 5fbc89b603..aceea0a932 100644 --- a/c/src/lib/libbsp/sh/shsim/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/Makefile.am @@ -15,12 +15,12 @@ nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h all-local: $(PREINSTALL_FILES) -$(PROJECT_INCLUDE)/gdbsci.h: include/gdbsci.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/gdbsci.h: include/gdbsci.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/gdbsci.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/gdbsci.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/sh/shsim/clock/Makefile.am b/c/src/lib/libbsp/sh/shsim/clock/Makefile.am index c01b48d7de..b0ab135108 100644 --- a/c/src/lib/libbsp/sh/shsim/clock/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/clock/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/clock.rel C_FILES = clockdrv.c diff --git a/c/src/lib/libbsp/sh/shsim/console/Makefile.am b/c/src/lib/libbsp/sh/shsim/console/Makefile.am index 6bc20389e6..b6258c9ce8 100644 --- a/c/src/lib/libbsp/sh/shsim/console/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared PGM = $(ARCH)/console.rel diff --git a/c/src/lib/libbsp/sh/shsim/gdbsci/Makefile.am b/c/src/lib/libbsp/sh/shsim/gdbsci/Makefile.am index aa9e5e71b4..c49942b28f 100644 --- a/c/src/lib/libbsp/sh/shsim/gdbsci/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/gdbsci/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/sci.rel C_FILES = gdbsci.c diff --git a/c/src/lib/libbsp/sh/shsim/scitab/Makefile.am b/c/src/lib/libbsp/sh/shsim/scitab/Makefile.am index 0d546d799b..c42125de77 100644 --- a/c/src/lib/libbsp/sh/shsim/scitab/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/scitab/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/scitab.rel C_FILES = scitab.c diff --git a/c/src/lib/libbsp/sh/shsim/startup/Makefile.am b/c/src/lib/libbsp/sh/shsim/startup/Makefile.am index b0df1a3943..7089c0c96c 100644 --- a/c/src/lib/libbsp/sh/shsim/startup/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/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/shsim/trap34/Makefile.am b/c/src/lib/libbsp/sh/shsim/trap34/Makefile.am index df889fd6ac..c197c7ca74 100644 --- a/c/src/lib/libbsp/sh/shsim/trap34/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/trap34/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/console.rel diff --git a/c/src/lib/libbsp/sh/shsim/wrapup/Makefile.am b/c/src/lib/libbsp/sh/shsim/wrapup/Makefile.am index 443391764e..6a161a4ab6 100644 --- a/c/src/lib/libbsp/sh/shsim/wrapup/Makefile.am +++ b/c/src/lib/libbsp/sh/shsim/wrapup/Makefile.am @@ -10,9 +10,9 @@ 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))) \ - $(foreach piece, $(CPU_PIECES), \ - ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/$(piece).rel) +OBJS = $(foreach piece, $(BSP_FILES), $(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