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

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

8 files changed, 19 insertions, 12 deletions

diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
index a1889ab7eb..4631f2a2db 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
+++ b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog
@@ -1,5 +1,15 @@
 2003-12-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
+	* Makefile.am: Add preinstallation dirstamp support.
+	* clock/Makefile.am: Cosmetics.
+	* console/Makefile.am: Cosmetics.
+	* network/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).
 	* console/Makefile.am: Remove all-local: $(ARCH).
 	* network/Makefile.am: Remove all-local: $(ARCH).
diff --git a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
index a84e55c117..d6939dd825 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am
@@ -19,13 +19,13 @@ include_HEADERS += include/coverhd.h
 all-local: $(PREINSTALL_FILES)
 
 if HAS_NETWORKING
-$(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/wd80x3.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/wd80x3.h
 endif
 
-$(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/i386/ts_386ex/clock/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am
index 77fe009d17..575a9d79e7 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/clock/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/clock.rel
 
 C_FILES = ckinit.c rtc.c
diff --git a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am
index 3454be7f53..0c5cd09224 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/console/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 VPATH = @srcdir@:@srcdir@/../../shared/io
 
 PGM = $(ARCH)/console.rel
diff --git a/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am
index d97119dc91..0a89cc6d1b 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/network/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/network.rel
 
 C_FILES = ne2000.c
diff --git a/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am
index 89f812ca6d..b1b6960742 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/startup/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/comm:@srcdir@/../../shared/irq:@srcdir@/../../shared/io
 
 PGM = $(ARCH)/startup.rel
diff --git a/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am
index 210a77137e..97c866c51a 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/timer/Makefile.am
@@ -2,13 +2,13 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/timer.rel
 
 ## sources
 C_FILES = timer.c
 S_FILES = timerisr.S
-timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
+    $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../../../automake/lib.am
diff --git a/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am
index d17e934337..46fa5d0eca 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/i386/ts_386ex/wrapup/Makefile.am
@@ -11,8 +11,9 @@ endif
 BSP_FILES = startup clock console timer $(NETWORK)
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \
-    $(wildcard ../../../../libcpu/i386/$(ARCH)/*.$(OBJEXT))
+OBJS = $(foreach piece, $(BSP_FILES), $(wildcard \
+    ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \
+    ../../../../libcpu/i386/$(ARCH)/*.$(OBJEXT))
 LIB = $(ARCH)/libbsp.a
 
 include $(top_srcdir)/../../../../automake/compile.am