2003-12-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: Add preinstallation dirstamp support.
	* clock/Makefile.am: Cosmetics.
	* console/Makefile.am: Cosmetics.
	* start/Makefile.am: Cosmetics.
	* startup/Makefile.am: Cosmetics.
	* timer/Makefile.am: Cosmetics.
	* wrapup/Makefile.am: Cosmetics.

8 files changed, 21 insertions, 11 deletions

diff --git a/c/src/lib/libbsp/i960/rxgen960/ChangeLog b/c/src/lib/libbsp/i960/rxgen960/ChangeLog
index 1df83a2664..f5567f04b7 100644
--- a/c/src/lib/libbsp/i960/rxgen960/ChangeLog
+++ b/c/src/lib/libbsp/i960/rxgen960/ChangeLog
@@ -1,3 +1,13 @@
+2003-12-03	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Add preinstallation dirstamp support.
+	* clock/Makefile.am: Cosmetics.
+	* console/Makefile.am: Cosmetics.
+	* start/Makefile.am: Cosmetics.
+	* startup/Makefile.am: Cosmetics.
+	* timer/Makefile.am: Cosmetics.
+	* wrapup/Makefile.am: Cosmetics.
+
 2003-12-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* clock/Makefile.am: Remove all-local: $(ARCH).
diff --git a/c/src/lib/libbsp/i960/rxgen960/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/Makefile.am
index f77893b71e..806bb31983 100644
--- a/c/src/lib/libbsp/i960/rxgen960/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/Makefile.am
@@ -16,8 +16,8 @@ all-local: $(PREINSTALL_FILES)
 
 noinst_HEADERS = include/rxgen960_config.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/i960/rxgen960/clock/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/clock/Makefile.am
index 499a664bbb..01bde7b3e4 100644
--- a/c/src/lib/libbsp/i960/rxgen960/clock/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/clock/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/clock.rel
 
 C_FILES = ckinit.c
diff --git a/c/src/lib/libbsp/i960/rxgen960/console/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/console/Makefile.am
index 9697b28826..3d3d7ec434 100644
--- a/c/src/lib/libbsp/i960/rxgen960/console/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/console/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/console.rel
 
 C_FILES = console.c
diff --git a/c/src/lib/libbsp/i960/rxgen960/start/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/start/Makefile.am
index 8f9787818f..cb276dc717 100644
--- a/c/src/lib/libbsp/i960/rxgen960/start/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/start/Makefile.am
@@ -19,7 +19,8 @@ bsplib_DATA = $(PROJECT_RELEASE)/lib/rxgen_romld.$(OBJEXT)
 $(PROJECT_RELEASE)/lib/rxgen_romld$(LIB_VARIANT).$(OBJEXT): $(ARCH)/rxgen_romld.$(OBJEXT)
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rxgen_romld$(LIB_VARIANT).$(OBJEXT)
+TMPINSTALL_FILES += \
+    $(PROJECT_RELEASE)/lib/rxgen_romld$(LIB_VARIANT).$(OBJEXT)
 
 all-local: $(OBJS) $(ARCH)/rxgen_romld.$(OBJEXT) $(TMPINSTALL_FILES)
 
diff --git a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
index 011a2e508d..a4802a2820 100644
--- a/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/startup/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 VPATH = @srcdir@:@srcdir@/../../../shared
 
 PGM = $(ARCH)/startup.rel
@@ -20,7 +19,8 @@ noinst_HEADERS = asmfault.h asmstub.h cntrltbl.h fault.h faultret.h flttbl.h \
 
 S_FILES = asmfault.S asmstub.S ihandler.S
 
-OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
+    $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../../../automake/lib.am
@@ -50,6 +50,7 @@ EXTRA_DIST = asmfault.S asmfault.h asmstub.S asmstub.h bspstart.c cntrltbl.c \
     frmstr.c frmstr.h i960.h ihandler.S ihandler.h intrtbl.c intrtbl.h \
     kkprintf.c linkcmds main.h memchnl.h nmi.c nulsystbl.c pmc901_memmap.h \
     prcb.c prcb.h rom.ld rom_cntrltbl.c rom_ibr.c rom_ibr.h rom_prcb.c \
-    rommon.h rxgen_romld.S sctns.c sctns.h setvec.c systbl.c systbl.h time.h
+    rommon.h rxgen_romld.S sctns.c sctns.h setvec.c systbl.c systbl.h \
+    time.h
 
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/i960/rxgen960/timer/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/timer/Makefile.am
index 13acd56e0c..6d37dc781d 100644
--- a/c/src/lib/libbsp/i960/rxgen960/timer/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/timer/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/timer.rel
 
 C_FILES = timer.c
diff --git a/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am b/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am
index d4710977f9..a654a3e307 100644
--- a/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/i960/rxgen960/wrapup/Makefile.am
@@ -8,8 +8,9 @@ include $(top_srcdir)/../../../../automake/lib.am
 BSP_PIECES = startup clock console timer
 
 # 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)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT))
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \
+    ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \
+    ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.$(OBJEXT))
 LIB = $(ARCH)/libbsp.a
 
 #