From 72653a2560a3267b4f1428de32e16915d6385bcd Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 15:49:02 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * console/Makefile.am: Cosmetics. * hw_init/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/sh/gensh4/ChangeLog | 8 ++++++++ c/src/lib/libbsp/sh/gensh4/Makefile.am | 8 ++++---- c/src/lib/libbsp/sh/gensh4/console/Makefile.am | 1 - c/src/lib/libbsp/sh/gensh4/hw_init/Makefile.am | 1 - c/src/lib/libbsp/sh/gensh4/startup/Makefile.am | 10 +++++----- c/src/lib/libbsp/sh/gensh4/wrapup/Makefile.am | 3 ++- 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/c/src/lib/libbsp/sh/gensh4/ChangeLog b/c/src/lib/libbsp/sh/gensh4/ChangeLog index df2edd8657..9faec1d2bb 100644 --- a/c/src/lib/libbsp/sh/gensh4/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh4/ChangeLog @@ -1,3 +1,11 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * console/Makefile.am: Cosmetics. + * hw_init/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/gensh4/Makefile.am b/c/src/lib/libbsp/sh/gensh4/Makefile.am index 3f8e4d22bd..7d3b56a43a 100644 --- a/c/src/lib/libbsp/sh/gensh4/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/Makefile.am @@ -17,12 +17,12 @@ all-local: $(PREINSTALL_FILES) EXTRA_DIST = times -$(PROJECT_INCLUDE)/sdram.h: include/sdram.h - $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/sdram.h: include/sdram.h $(PROJECT_INCLUDE)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sdram.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sdram.h -$(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/gensh4/console/Makefile.am b/c/src/lib/libbsp/sh/gensh4/console/Makefile.am index 793b697304..09a95c1676 100644 --- a/c/src/lib/libbsp/sh/gensh4/console/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - PGM = $(ARCH)/console.rel C_FILES = console.c diff --git a/c/src/lib/libbsp/sh/gensh4/hw_init/Makefile.am b/c/src/lib/libbsp/sh/gensh4/hw_init/Makefile.am index 43a7984f21..1e9f048a28 100644 --- a/c/src/lib/libbsp/sh/gensh4/hw_init/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/hw_init/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared PGM = $(ARCH)/hw_init.rel diff --git a/c/src/lib/libbsp/sh/gensh4/startup/Makefile.am b/c/src/lib/libbsp/sh/gensh4/startup/Makefile.am index b3db960915..4392685d00 100644 --- a/c/src/lib/libbsp/sh/gensh4/startup/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/startup/Makefile.am @@ -2,13 +2,12 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel -C_FILES = bsplibc.c bsppost.c bspstart.c bspclean.c sbrk.c \ - bootcard.c main.c gnatinstallhandler.c +C_FILES = bsplibc.c bsppost.c bspstart.c bspclean.c sbrk.c bootcard.c main.c \ + gnatinstallhandler.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) @@ -35,8 +34,9 @@ $(PROJECT_RELEASE)/lib/linkcmds.rom2ram: linkcmds.rom2ram $(PGM): $(OBJS) $(make-rel) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds $(PROJECT_RELEASE)/lib/linkcmds.rom \ - $(PROJECT_RELEASE)/lib/linkcmds.rom2ram +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds \ + $(PROJECT_RELEASE)/lib/linkcmds.rom \ + $(PROJECT_RELEASE)/lib/linkcmds.rom2ram all-local: $(TMPINSTALL_FILES) $(OBJS) $(PGM) diff --git a/c/src/lib/libbsp/sh/gensh4/wrapup/Makefile.am b/c/src/lib/libbsp/sh/gensh4/wrapup/Makefile.am index 4dbafec954..69d64557f7 100644 --- a/c/src/lib/libbsp/sh/gensh4/wrapup/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh4/wrapup/Makefile.am @@ -11,7 +11,8 @@ CPU_PIECES = clock sci timer score # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ - $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/$(piece).rel) + $(foreach piece, $(CPU_PIECES), \ + ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3