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

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

11 files changed, 41 insertions, 28 deletions

diff --git a/c/src/lib/libbsp/m68k/mvme162/ChangeLog b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
index 2b78f46c23..5496a83715 100644
--- a/c/src/lib/libbsp/m68k/mvme162/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mvme162/ChangeLog
@@ -1,3 +1,16 @@
+2003-12-03	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Add preinstallation dirstamp support.
+	* clock/Makefile.am: Cosmetics.
+	* console/Makefile.am: Cosmetics.
+	* consolex/Makefile.am: Add preinstallation dirstamp support.
+	* network/Makefile.am: Cosmetics.
+	* startup/Makefile.am: Cosmetics.
+	* timer/Makefile.am: Cosmetics.
+	* tod/Makefile.am: Cosmetics.
+	* tools/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/m68k/mvme162/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
index 9bc1bc6a85..3bea883a52 100644
--- a/c/src/lib/libbsp/m68k/mvme162/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/Makefile.am
@@ -28,21 +28,23 @@ all-local: $(PREINSTALL_FILES)
 
 EXTRA_DIST = times
 
-$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h
+    $(top_srcdir)/../shared/mvme/mvme16x_hw.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
 
-$(PROJECT_INCLUDE)/page_table.h: include/page_table.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/page_table.h: include/page_table.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/page_table.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/page_table.h
 
-$(PROJECT_INCLUDE)/tod.h: include/tod.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/tod.h: include/tod.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tod.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/tod.h
 
-$(PROJECT_INCLUDE)/mvme16x_hw.h: \
-    $(top_srcdir)/../shared/mvme/mvme16x_hw.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/mvme16x_hw.h: $(top_srcdir)/../shared/mvme/mvme16x_hw.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mvme16x_hw.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/mvme16x_hw.h
 
 include $(top_srcdir)/../../../../automake/subdirs.am
diff --git a/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am
index 499a664bbb..01bde7b3e4 100644
--- a/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/clock/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/clock.rel
 
 C_FILES = ckinit.c
diff --git a/c/src/lib/libbsp/m68k/mvme162/console/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/console/Makefile.am
index 0d451d4e79..9f4fde7145 100644
--- a/c/src/lib/libbsp/m68k/mvme162/console/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/console/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/console.rel
 
 C_FILES = console.c
diff --git a/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am
index 83a1a4b97d..1b0523b591 100644
--- a/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/consolex/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/consolex.rel
 
 C_FILES = consolex.c
@@ -22,19 +21,21 @@ include $(top_srcdir)/../../../../automake/lib.am
 $(PGM): $(OBJS)
 	$(make-rel)
 
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
-    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
 all-local: $(OBJS) $(PGM) $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(PGM)
 
 EXTRA_DIST = README cTest.c consolex.c consolex.h
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
+$(PROJECT_INCLUDE)/consolex.h: consolex.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/consolex.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/consolex.h
+
 include $(top_srcdir)/../../../../automake/local.am
diff --git a/c/src/lib/libbsp/m68k/mvme162/network/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/network/Makefile.am
index f626607b2d..a2242e2f62 100644
--- a/c/src/lib/libbsp/m68k/mvme162/network/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/network/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 VPATH = @srcdir@:@srcdir@/../../mvme167/network
 
 PGM = $(ARCH)/network.rel
diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am
index a247c6f84d..ee827af4a4 100644
--- a/c/src/lib/libbsp/m68k/mvme162/startup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/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/m68k/mvme162/timer/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am
index e70c4770b2..88f8b2ff5b 100644
--- a/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/timer/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/timer.rel
 
 C_FILES = timer.c
diff --git a/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am
index f779c36847..e613d21140 100644
--- a/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/tod/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/tod.rel
 
 C_FILES = tod.c
diff --git a/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am
index c225804124..efde1655f4 100644
--- a/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/tools/Makefile.am
@@ -15,3 +15,4 @@ install-exec-local: $(PROGRAMS)
 	$(INSTALL_PROGRAM) $(PROGRAMS) $(PROJECT_ROOT)/@RTEMS_BSP@/bin
 endif
 include $(top_srcdir)/../../../../../automake/host.am
+
diff --git a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am
index 44099b19a7..f5b85e8677 100644
--- a/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/m68k/mvme162/wrapup/Makefile.am
@@ -10,10 +10,12 @@ endif
 BSP_PIECES = startup clock console timer tod $(NETWORKING_DRIVER)
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.$(OBJEXT))) \
-    $(wildcard ../consolex/$(ARCH)/consolex.rel) \
-    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) \
-    $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
+OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard \
+    ../$(piece)/$(ARCH)/*.$(OBJEXT))) $(wildcard \
+    ../consolex/$(ARCH)/consolex.rel) $(wildcard \
+    ../../../../libcpu/$(RTEMS_CPU)/shared/misc/$(ARCH)/*.$(OBJEXT)) \
+    $(wildcard \
+    ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel)
 
 LIB = $(ARCH)/libbsp.a