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

	* Makefile.am: Reformat. Use dirstamp for preinstallation.
	* mpc505/Makefile.am: Reformat.
	* mpc505/ictrl/Makefile.am: Reformat. Use dirstamp for preinstallation.
	* mpc505/timer/Makefile.am: Reformat.
	* mpc505/vectors/Makefile.am: Reformat.
	* mpc6xx/Makefile.am: Reformat.
	* mpc6xx/clock/Makefile.am: Reformat. Use dirstamp for preinstallation.
	* mpc6xx/exceptions/Makefile.am: Reformat. Use dirstamp for preinstallation.
	* mpc6xx/mmu/Makefile.am: Reformat. Use dirstamp for preinstallation.
	* mpc6xx/timer/Makefile.am: Reformat.
	* mpc6xx/wrapup/Makefile.am: Reformat.
	* mpc8260/Makefile.am: Reformat. Use dirstamp for preinstallation.
	* mpc8260/clock/Makefile.am: Reformat.
	* mpc8260/console-generic/Makefile.am: Reformat.
	* mpc8260/cpm/Makefile.am: Reformat.
	* mpc8260/exceptions/Makefile.am: Reformat. Use dirstamp for preinstallation.
	* mpc8260/mmu/Makefile.am: Reformat.
	* mpc8260/timer/Makefile.am: Reformat.
	* mpc8xx/Makefile.am: Reformat. Use dirstamp for preinstallation.
	* mpc8xx/clock/Makefile.am: Reformat.
	* mpc8xx/console-generic/Makefile.am: Reformat.
	* mpc8xx/cpm/Makefile.am: Reformat.
	* mpc8xx/exceptions/Makefile.am: Reformat. Use dirstamp for preinstallation.
	* mpc8xx/mmu/Makefile.am: Reformat.
	* mpc8xx/timer/Makefile.am: Reformat.
	* ppc403/Makefile.am: Reformat.
	* ppc403/clock/Makefile.am: Reformat.
	* ppc403/console/Makefile.am: Reformat.
	* ppc403/ictrl/Makefile.am: Reformat. Use dirstamp for preinstallation.
	* ppc403/timer/Makefile.am: Reformat.
	* ppc403/tty_drv/Makefile.am: Reformat. Use dirstamp for preinstallation.
	* ppc403/vectors/Makefile.am: Reformat.
	* shared/Makefile.am: Reformat.
	* shared/include/Makefile.am: Reformat. Use dirstamp for preinstallation.
	* shared/src/Makefile.am: Reformat. Use dirstamp for preinstallation.
	* wrapup/Makefile.am: Reformat.

6 files changed, 42 insertions, 34 deletions

diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am
index 230e82d2b6..a2c4551544 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 SUBDIRS = exceptions mmu clock timer wrapup
 
 include $(top_srcdir)/../../../automake/subdirs.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
index 65a9a13f17..9138c3f868 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 C_FILES = c_clock.c
 
 include_libcpudir = $(includedir)/libcpu
@@ -14,20 +13,23 @@ c_clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/libcpu:
-	$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/libcpu/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \
-    $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
-
 all-local: $(ARCH) $(PREINSTALL_FILES) $(c_clock_rel_OBJECTS)
 
 EXTRA_DIST = c_clock.c c_clock.h
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/libcpu
+	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+
+$(PROJECT_INCLUDE)/libcpu/c_clock.h: c_clock.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/c_clock.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/c_clock.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
index a18e420e2a..8d86613a18 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/exceptions.rel
 
 C_FILES = raw_exception.c
@@ -19,11 +18,6 @@ exceptions_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/libcpu:
-	$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/libcpu/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
@@ -31,13 +25,21 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 $(PGM): $(exceptions_rel_OBJECTS)
 	$(make-rel)
 
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \
-    $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
-
 all-local: $(ARCH) $(PREINSTALL_FILES) $(exceptions_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
 EXTRA_DIST = asm_utils.S raw_exception.c raw_exception.h
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/libcpu
+	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+
+$(PROJECT_INCLUDE)/libcpu/raw_exception.h: raw_exception.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/raw_exception.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/raw_exception.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
index 183fd88c90..20b2ff0c4c 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/mmu.rel
 
 C_FILES = bat.c pte121.c
@@ -13,16 +12,12 @@ include_libcpudir = $(includedir)/libcpu
 
 include_libcpu_HEADERS = bat.h pte121.h
 
-mmu_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+mmu_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) \
+    $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
 
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/libcpu:
-	$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/libcpu/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
@@ -30,13 +25,25 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 $(PGM): $(mmu_rel_OBJECTS)
 	$(make-rel)
 
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \
-    $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
-
 all-local: $(ARCH) $(PREINSTALL_FILES) $(mmu_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
 EXTRA_DIST = bat.c bat.h mmuAsm.S pte121.c pte121.h
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/libcpu
+	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+
+$(PROJECT_INCLUDE)/libcpu/bat.h: bat.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/bat.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/bat.h
+
+$(PROJECT_INCLUDE)/libcpu/pte121.h: pte121.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/pte121.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/pte121.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am
index 4babeaccf4..ece1756432 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/timer.rel
 
 C_FILES = timer.c
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am
index cfba3ebd2b..010d5f65a7 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am
@@ -2,15 +2,14 @@
 ## $Id$
 ##
 
-
 # PROC_SPECIFIC_O_FILES = exceptions mmu clock
 PROC_SPECIFIC_O_FILES = exceptions mmu
 GENERIC_FILES =
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
-OBJS = \
-    $(foreach piece, $(PROC_SPECIFIC_O_FILES), ../../mpc6xx/$(piece)/$(ARCH)/*.$(OBJEXT)) \
-    $(foreach piece, $(GENERIC_FILES), ../../mpc6xx/$(piece)/$(ARCH)/*.$(OBJEXT))
+OBJS = $(foreach piece, $(PROC_SPECIFIC_O_FILES), \
+    ../../mpc6xx/$(piece)/$(ARCH)/*.$(OBJEXT)) $(foreach piece, \
+    $(GENERIC_FILES), ../../mpc6xx/$(piece)/$(ARCH)/*.$(OBJEXT))
 LIB = $(ARCH)/libcpuspec.a
 
 include $(top_srcdir)/../../../automake/compile.am