From 726a2407b18359209312ce0085d207856601c842 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 3 Dec 2003 15:48:58 +0000 Subject: 2003-12-03 Ralf Corsepius * Makefile.am: Add preinstallation dirstamp support. * console/Makefile.am: Cosmetics. * startup/Makefile.am: Cosmetics. * wrapup/Makefile.am: Cosmetics. --- c/src/lib/libbsp/sh/gensh2/ChangeLog | 7 +++++++ c/src/lib/libbsp/sh/gensh2/Makefile.am | 4 ++-- c/src/lib/libbsp/sh/gensh2/console/Makefile.am | 1 - c/src/lib/libbsp/sh/gensh2/startup/Makefile.am | 6 ++---- c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am | 3 ++- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog index 40a1935502..47bcb3db9a 100644 --- a/c/src/lib/libbsp/sh/gensh2/ChangeLog +++ b/c/src/lib/libbsp/sh/gensh2/ChangeLog @@ -1,3 +1,10 @@ +2003-12-03 Ralf Corsepius + + * Makefile.am: Add preinstallation dirstamp support. + * console/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/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index d0098ca295..1d836ece28 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am @@ -14,8 +14,8 @@ include_HEADERS += include/coverhd.h all-local: $(PREINSTALL_FILES) -$(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/gensh2/console/Makefile.am b/c/src/lib/libbsp/sh/gensh2/console/Makefile.am index 6bd7a5c3fb..0b4e1397ba 100644 --- a/c/src/lib/libbsp/sh/gensh2/console/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/console/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../../shared PGM = $(ARCH)/console.rel diff --git a/c/src/lib/libbsp/sh/gensh2/startup/Makefile.am b/c/src/lib/libbsp/sh/gensh2/startup/Makefile.am index 4ec63aed86..0ecaf2cec6 100644 --- a/c/src/lib/libbsp/sh/gensh2/startup/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/startup/Makefile.am @@ -2,7 +2,6 @@ ## $Id$ ## - VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared PGM = $(ARCH)/startup.rel @@ -24,13 +23,12 @@ bsplib_DATA = linkcmds $(PROJECT_RELEASE)/lib/linkcmds: linkcmds $(INSTALL_DATA) $< $@ +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds $(PGM): $(OBJS) $(make-rel) -PREINSTALL_FILES = $(PROJECT_RELEASE)/lib/linkcmds - -all-local: $(PREINSTALL_FILES) $(OBJS) $(PGM) +all-local: $(PREINSTALL_FILES) $(OBJS) $(PGM) $(TMPINSTALL_FILES) .PRECIOUS: $(PGM) diff --git a/c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am b/c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am index 7f971a2559..36fad2c2fe 100644 --- a/c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am @@ -11,7 +11,8 @@ CPU_PIECES = clock timer sci 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