13 files changed, 47 insertions, 33 deletions
diff --git a/c/src/lib/libcpu/mips/ChangeLog b/c/src/lib/libcpu/mips/ChangeLog
index 31a430a29a..19b45ad847 100644
--- a/c/src/lib/libcpu/mips/ChangeLog
+++ b/c/src/lib/libcpu/mips/ChangeLog
@@ -1,3 +1,18 @@
+2003-12-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Reformat.
+	* clock/Makefile.am: Reformat.
+	* mongoosev/Makefile.am: Reformat. Use dirstamps for preinstallation.
+	* tx39/Makefile.am: Ditto.
+	* shared/cache/Makefile.am: Ditto.
+	* mongoosev/duart/Makefile.am: Ditto.
+	* mongoosev/vectorisrs/Makefile.am: Reformat.
+	* r46xx/vectorisrs/Makefile.am: Reformat.
+	* shared/Makefile.am: Reformat.
+	* shared/interrupts/Makefile.am: Reformat.
+	* timer/Makefile.am: Reformat.
+	* tx39/vectorisrs/Makefile.am: Reformat.
+
 2003-10-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* mongoosev/Makefile.am: Rework preinstall rules.
diff --git a/c/src/lib/libcpu/mips/Makefile.am b/c/src/lib/libcpu/mips/Makefile.am
index adb4413043..d7958eb1b5 100644
--- a/c/src/lib/libcpu/mips/Makefile.am
+++ b/c/src/lib/libcpu/mips/Makefile.am
@@ -20,6 +20,5 @@ endif
 
 SUBDIRS = $(SHARED_LIB) $(CPU_SUBDIR)
 
-
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/clock/Makefile.am b/c/src/lib/libcpu/mips/clock/Makefile.am
index 8f960860c1..3d39622bf7 100644
--- a/c/src/lib/libcpu/mips/clock/Makefile.am
+++ b/c/src/lib/libcpu/mips/clock/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/clock.rel
 
 C_FILES = ckinit.c
@@ -11,7 +10,8 @@ S_FILES = clock.S
 
 noinst_HEADERS = clock.h
 
-clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+clock_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/libcpu/mips/mongoosev/Makefile.am b/c/src/lib/libcpu/mips/mongoosev/Makefile.am
index 5f53303f2b..3ddbc861f8 100644
--- a/c/src/lib/libcpu/mips/mongoosev/Makefile.am
+++ b/c/src/lib/libcpu/mips/mongoosev/Makefile.am
@@ -13,12 +13,13 @@ all-local: $(PREINSTALL_FILES)
 
 PREINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/libcpu:
+$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/libcpu
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu
+	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
 
-$(PROJECT_INCLUDE)/libcpu/mongoose-v.h: include/mongoose-v.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/libcpu/mongoose-v.h: include/mongoose-v.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mongoose-v.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mongoose-v.h
 
 include $(top_srcdir)/../../../automake/subdirs.am
diff --git a/c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am b/c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am
index c3b199a1e3..69fe77a3dc 100644
--- a/c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am
+++ b/c/src/lib/libcpu/mips/mongoosev/duart/Makefile.am
@@ -29,12 +29,13 @@ EXTRA_DIST = mg5uart.c README.mguart mg5uart.c mg5uart_reg.c
 
 PREINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/libchip:
+$(PROJECT_INCLUDE)/libchip/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/libchip
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip
+	@: > $(PROJECT_INCLUDE)/libchip/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/$(dirstamp)
 
-$(PROJECT_INCLUDE)/libchip/mg5uart.h: mg5uart.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/libchip/mg5uart.h: mg5uart.h $(PROJECT_INCLUDE)/libchip/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libchip/mg5uart.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libchip/mg5uart.h
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/mongoosev/vectorisrs/Makefile.am b/c/src/lib/libcpu/mips/mongoosev/vectorisrs/Makefile.am
index 2cdbc828fb..acbfdd9263 100644
--- a/c/src/lib/libcpu/mips/mongoosev/vectorisrs/Makefile.am
+++ b/c/src/lib/libcpu/mips/mongoosev/vectorisrs/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/vectorisrs.rel
 
 C_FILES = maxvectors.c vectorisrs.c
diff --git a/c/src/lib/libcpu/mips/r46xx/vectorisrs/Makefile.am b/c/src/lib/libcpu/mips/r46xx/vectorisrs/Makefile.am
index 2cdbc828fb..acbfdd9263 100644
--- a/c/src/lib/libcpu/mips/r46xx/vectorisrs/Makefile.am
+++ b/c/src/lib/libcpu/mips/r46xx/vectorisrs/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/vectorisrs.rel
 
 C_FILES = maxvectors.c vectorisrs.c
diff --git a/c/src/lib/libcpu/mips/shared/Makefile.am b/c/src/lib/libcpu/mips/shared/Makefile.am
index 776f4fe321..95fd8049bf 100644
--- a/c/src/lib/libcpu/mips/shared/Makefile.am
+++ b/c/src/lib/libcpu/mips/shared/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 SUBDIRS = cache interrupts
 
 include $(top_srcdir)/../../../automake/subdirs.am
diff --git a/c/src/lib/libcpu/mips/shared/cache/Makefile.am b/c/src/lib/libcpu/mips/shared/cache/Makefile.am
index 2926ba930b..a515792795 100644
--- a/c/src/lib/libcpu/mips/shared/cache/Makefile.am
+++ b/c/src/lib/libcpu/mips/shared/cache/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 VPATH = @srcdir@:@srcdir@/../../../shared/src
 
 C_FILES = cache.c cache_aligned_malloc.c cache_manager.c
@@ -18,22 +17,24 @@ include $(top_srcdir)/../../../automake/lib.am
 
 AM_CPPFLAGS += -I$(srcdir)
 
-$(PROJECT_INCLUDE)/libcpu:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/libcpu/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
 cache.h: $(top_srcdir)/../shared/include/cache.h
 	cp $< $@
 
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \
-    $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
-
 all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS)
 
 CLEANFILES = cache.h
 
 EXTRA_DIST = cache.c cache_.h
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/libcpu
+	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+
+$(PROJECT_INCLUDE)/libcpu/cache.h: cache.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cache.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cache.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/shared/interrupts/Makefile.am b/c/src/lib/libcpu/mips/shared/interrupts/Makefile.am
index 680048d9f1..6be4c06d6f 100644
--- a/c/src/lib/libcpu/mips/shared/interrupts/Makefile.am
+++ b/c/src/lib/libcpu/mips/shared/interrupts/Makefile.am
@@ -2,14 +2,14 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/interrupts.rel
 
 C_FILES = installisrentries.c vectorexceptions.c
 
 S_FILES = isr_entries.S
 
-interrupts_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+interrupts_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/libcpu/mips/timer/Makefile.am b/c/src/lib/libcpu/mips/timer/Makefile.am
index b8f00b3404..a75be28c4d 100644
--- a/c/src/lib/libcpu/mips/timer/Makefile.am
+++ b/c/src/lib/libcpu/mips/timer/Makefile.am
@@ -2,14 +2,14 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/timer.rel
 
 C_FILES = timer.c
 
 S_FILES = gettime.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/libcpu/mips/tx39/Makefile.am b/c/src/lib/libcpu/mips/tx39/Makefile.am
index 7cc324119b..26715c7f48 100644
--- a/c/src/lib/libcpu/mips/tx39/Makefile.am
+++ b/c/src/lib/libcpu/mips/tx39/Makefile.am
@@ -13,12 +13,13 @@ all-local: $(PREINSTALL_FILES)
 
 PREINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/libcpu:
+$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/libcpu
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu
+	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
 
-$(PROJECT_INCLUDE)/libcpu/tx3904.h: include/tx3904.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/libcpu/tx3904.h: include/tx3904.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/tx3904.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/tx3904.h
 
 include $(top_srcdir)/../../../automake/subdirs.am
diff --git a/c/src/lib/libcpu/mips/tx39/vectorisrs/Makefile.am b/c/src/lib/libcpu/mips/tx39/vectorisrs/Makefile.am
index 2cdbc828fb..acbfdd9263 100644
--- a/c/src/lib/libcpu/mips/tx39/vectorisrs/Makefile.am
+++ b/c/src/lib/libcpu/mips/tx39/vectorisrs/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/vectorisrs.rel
 
 C_FILES = maxvectors.c vectorisrs.c