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

	* Makefile.am: Add dirstamp support to preinstallation.
	* clock/Makefile.am: Cosmetics.
	* console/Makefile.am: Cosmetics.
	* gnatsupp/Makefile.am: Cosmetics.
	* leon_open_eth/Makefile.am: Correct paths to automake/*.am..
	* startup/Makefile.am: Cosmetics.
	* timer/Makefile.am: Cosmetics.
	* wrapup/Makefile.am: Cosmetics.

	PR 538/bsps:
	* wrapup/Makefile.am: Add leon_open_eth.rel

9 files changed, 25 insertions, 16 deletions

diff --git a/c/src/lib/libbsp/sparc/leon/ChangeLog b/c/src/lib/libbsp/sparc/leon/ChangeLog
index 18db07104a..b3ac7778b8 100644
--- a/c/src/lib/libbsp/sparc/leon/ChangeLog
+++ b/c/src/lib/libbsp/sparc/leon/ChangeLog
@@ -1,5 +1,19 @@
 2003-12-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
+	* Makefile.am: Add dirstamp support to preinstallation.
+	* clock/Makefile.am: Cosmetics.
+	* console/Makefile.am: Cosmetics.
+	* gnatsupp/Makefile.am: Cosmetics.
+	* leon_open_eth/Makefile.am: Correct paths to automake/*.am..
+	* startup/Makefile.am: Cosmetics.
+	* timer/Makefile.am: Cosmetics.
+	* wrapup/Makefile.am: Cosmetics.
+
+	PR 538/bsps:
+	* wrapup/Makefile.am: Add leon_open_eth.rel
+
+2003-12-02	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
 	* clock/Makefile.am: Remove all-local: $(ARCH).
 	* console/Makefile.am: Remove all-local: $(ARCH).
 	* gnatsupp/Makefile.am: Remove all-local: $(ARCH).
diff --git a/c/src/lib/libbsp/sparc/leon/Makefile.am b/c/src/lib/libbsp/sparc/leon/Makefile.am
index 18b4b9e3bb..215b7e7fb8 100644
--- a/c/src/lib/libbsp/sparc/leon/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon/Makefile.am
@@ -18,12 +18,12 @@ all-local: $(PREINSTALL_FILES)
 
 EXTRA_DIST = times
 
-$(PROJECT_INCLUDE)/leon.h: include/leon.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/leon.h: include/leon.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/leon.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/leon.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/sparc/leon/clock/Makefile.am b/c/src/lib/libbsp/sparc/leon/clock/Makefile.am
index 499a664bbb..01bde7b3e4 100644
--- a/c/src/lib/libbsp/sparc/leon/clock/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon/clock/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/clock.rel
 
 C_FILES = ckinit.c
diff --git a/c/src/lib/libbsp/sparc/leon/console/Makefile.am b/c/src/lib/libbsp/sparc/leon/console/Makefile.am
index b47f4e7492..ac8e2a0cee 100644
--- a/c/src/lib/libbsp/sparc/leon/console/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon/console/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/console.rel
 
 C_FILES = console.c consolereserveresources.c debugputs.c
diff --git a/c/src/lib/libbsp/sparc/leon/gnatsupp/Makefile.am b/c/src/lib/libbsp/sparc/leon/gnatsupp/Makefile.am
index d82bd38aaf..9a031cc4e8 100644
--- a/c/src/lib/libbsp/sparc/leon/gnatsupp/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon/gnatsupp/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 VPATH = @srcdir@:@srcdir@/../../shared:@srcdir@/../../../shared
 
 PGM = $(ARCH)/gnatsupp.rel
diff --git a/c/src/lib/libbsp/sparc/leon/leon_open_eth/Makefile.am b/c/src/lib/libbsp/sparc/leon/leon_open_eth/Makefile.am
index 48f1edcdba..4e13ab0c17 100644
--- a/c/src/lib/libbsp/sparc/leon/leon_open_eth/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon/leon_open_eth/Makefile.am
@@ -2,7 +2,6 @@
 ## Makefile.am,v 1.5 2002/12/14 08:17:45 ralf Exp
 ##
 
-
 PGM = $(ARCH)/leon_open_eth.rel
 
 C_FILES = leon_open_eth.c
@@ -10,8 +9,8 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
 OBJS = $(C_O_FILES)
 
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.am
+include $(top_srcdir)/../../../../automake/compile.am
+include $(top_srcdir)/../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -32,4 +31,4 @@ endif
 
 EXTRA_DIST = leon_open_eth.c
 
-include $(top_srcdir)/../../../../../../automake/local.am
+include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/sparc/leon/startup/Makefile.am b/c/src/lib/libbsp/sparc/leon/startup/Makefile.am
index 6fe1f18c8e..09d9c8ac32 100644
--- a/c/src/lib/libbsp/sparc/leon/startup/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon/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/sparc/leon/timer/Makefile.am b/c/src/lib/libbsp/sparc/leon/timer/Makefile.am
index 607ab5a1f9..89cd2f36f3 100644
--- a/c/src/lib/libbsp/sparc/leon/timer/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon/timer/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/timer.rel
 
 C_FILES = timer.c
diff --git a/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am b/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am
index 49c21c0fc1..50d7d4fa1b 100644
--- a/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon/wrapup/Makefile.am
@@ -7,13 +7,14 @@ if HAS_NETWORKING
 NETWORKING_DRIVER = leon_open_eth
 endif
 
-BSP_PIECES = startup console clock timer gnatsupp $(NETWORK)
+BSP_PIECES = startup console clock timer gnatsupp $(NETWORKING_DRIVER)
 # pieces to pick up out of libcpu/sparc
 CPU_PIECES = cache reg_win syscall
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \
-    $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/*.$(OBJEXT))
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \
+    ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(foreach piece, $(CPU_PIECES), \
+    ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/*.$(OBJEXT))
 LIB = $(ARCH)/libbsp.a
 
 include $(top_srcdir)/../../../../automake/compile.am