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.

37 files changed, 259 insertions, 152 deletions

diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index 6aa3d99746..84dcad0711 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,3 +1,42 @@
+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.
+
 2003-10-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am
index 27230369e1..781ed782ed 100644
--- a/c/src/lib/libcpu/powerpc/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/Makefile.am
@@ -4,26 +4,10 @@
 
 ACLOCAL_AMFLAGS = -I ../../../aclocal
 
-nobase_include_HEADERS = rtems/powerpc/cache.h \
+include_rtems_powerpcdir = $(includedir)/rtems/powerpc
+include_rtems_powerpc_HEADERS = rtems/powerpc/cache.h \
     rtems/powerpc/debugmod.h
 
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/powerpc:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/%: %
-	$(INSTALL_DATA) $< $@
-
-TMPINSTALL_FILES = $(PROJECT_INCLUDE) \
-  $(PROJECT_INCLUDE)/rtems \
-  $(PROJECT_INCLUDE)/rtems/powerpc \
-  $(nobase_include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
 ## Check configure.in for conditions to set the conditionals below
 if shared
 SHARED_LIB = shared
@@ -53,5 +37,20 @@ SUBDIRS = $(SHARED_LIB) $(CPU_SUBDIR) wrapup
 
 all-local: $(TMPINSTALL_FILES)
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/powerpc
+	@: > $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rtems/powerpc/cache.h: rtems/powerpc/cache.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/cache.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/cache.h
+
+$(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h: rtems/powerpc/debugmod.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h
+
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc505/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/Makefile.am
index bb3c700e9e..fe5d626d4f 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc505/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 SUBDIRS = ictrl vectors timer
 
 include $(top_srcdir)/../../../automake/subdirs.am
diff --git a/c/src/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am
index 47f6f17535..13ec3b171a 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc505/ictrl/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/ictrl.rel
 
 C_FILES = ictrl.c
@@ -14,11 +13,6 @@ ictrl_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
@@ -26,13 +20,21 @@ $(PROJECT_INCLUDE)/%.h: %.h
 $(PGM): $(ictrl_rel_OBJECTS)
 	$(make-rel)
 
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
-   $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
 all-local: $(ARCH) $(ictrl_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(PGM)
 
 EXTRA_DIST = ictrl.c ictrl.h
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
+$(PROJECT_INCLUDE)/ictrl.h: ictrl.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ictrl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/ictrl.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am
index 4babeaccf4..ece1756432 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/timer.rel
 
 C_FILES = timer.c
diff --git a/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am
index 8d97d03710..4f50a56ff0 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = ${ARCH}/vectors.rel
 
 ## Assembly sources
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
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am
index b3988e579a..73f465c52e 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8260/Makefile.am
@@ -9,20 +9,35 @@ include_mpc8260dir = $(includedir)/mpc8260
 include_HEADERS = include/mpc8260.h
 include_mpc8260_HEADERS = include/console.h include/mmu.h include/cpm.h
 
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/mpc8260 \
-    $(include_HEADERS:include/%=$(PROJECT_INCLUDE)/%) \
-    $(include_mpc8260_HEADERS:include/%=$(PROJECT_INCLUDE)/mpc8260/%)
+all-local: $(PREINSTALL_FILES)
 
-$(PROJECT_INCLUDE)/mpc8260:
-	$(mkinstalldirs) $@
+PREINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/%.h: include/%.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
 
-$(PROJECT_INCLUDE)/mpc8260/%.h: include/%.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/mpc8260/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/mpc8260
+	@: > $(PROJECT_INCLUDE)/mpc8260/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/$(dirstamp)
 
-all-local: $(PREINSTALL_FILES)
+$(PROJECT_INCLUDE)/mpc8260.h: include/mpc8260.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260.h
+
+$(PROJECT_INCLUDE)/mpc8260/console.h: include/console.h $(PROJECT_INCLUDE)/mpc8260/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260/console.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/console.h
+
+$(PROJECT_INCLUDE)/mpc8260/mmu.h: include/mmu.h $(PROJECT_INCLUDE)/mpc8260/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260/mmu.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/mmu.h
+
+$(PROJECT_INCLUDE)/mpc8260/cpm.h: include/cpm.h $(PROJECT_INCLUDE)/mpc8260/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8260/cpm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8260/cpm.h
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/clock/Makefile.am
index e99a32f08a..1a849a2266 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8260/clock/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = ${ARCH}/clock.rel
 
 ## C sources
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/console-generic/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/console-generic/Makefile.am
index 3f64451004..50eb2730fc 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/console-generic/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8260/console-generic/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = ${ARCH}/console-generic.rel
 
 ## C sources
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/cpm/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/cpm/Makefile.am
index 5a796a81c8..ade61e109a 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/cpm/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8260/cpm/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = ${ARCH}/cp.rel
 
 ## C sources
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/exceptions/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/exceptions/Makefile.am
index 1b00b276e7..f89204edd7 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/exceptions/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8260/exceptions/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/exceptions.rel
 
 C_FILES = raw_exception.c
@@ -18,11 +17,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 +=
 #
@@ -30,13 +24,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/mpc8260/mmu/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/mmu/Makefile.am
index f62c09a0a6..675da4a183 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/mmu/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8260/mmu/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = ${ARCH}/mmu.rel
 
 ## C sources
diff --git a/c/src/lib/libcpu/powerpc/mpc8260/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8260/timer/Makefile.am
index 109bafeac1..3d413c3575 100644
--- a/c/src/lib/libcpu/powerpc/mpc8260/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8260/timer/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = ${ARCH}/timer.rel
 
 ## C sources
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am
index 94100985ed..6e9a61b612 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/Makefile.am
@@ -9,20 +9,35 @@ include_mpc8xxdir = $(includedir)/mpc8xx
 include_HEADERS = include/mpc8xx.h
 include_mpc8xx_HEADERS = include/console.h include/cpm.h include/mmu.h
 
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/mpc8xx \
-    $(include_HEADERS:include/%=$(PROJECT_INCLUDE)/%) \
-    $(include_mpc8xx_HEADERS:include/%=$(PROJECT_INCLUDE)/mpc8xx/%)
+all-local: $(PREINSTALL_FILES)
 
-$(PROJECT_INCLUDE)/mpc8xx:
-	$(mkinstalldirs) $@
+PREINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/%.h: include/%.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
 
-$(PROJECT_INCLUDE)/mpc8xx/%.h: include/%.h
-	$(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/mpc8xx/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/mpc8xx
+	@: > $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp)
 
-all-local: $(PREINSTALL_FILES)
+$(PROJECT_INCLUDE)/mpc8xx.h: include/mpc8xx.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx.h
+
+$(PROJECT_INCLUDE)/mpc8xx/console.h: include/console.h $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx/console.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/console.h
+
+$(PROJECT_INCLUDE)/mpc8xx/cpm.h: include/cpm.h $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx/cpm.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/cpm.h
+
+$(PROJECT_INCLUDE)/mpc8xx/mmu.h: include/mmu.h $(PROJECT_INCLUDE)/mpc8xx/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mpc8xx/mmu.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mpc8xx/mmu.h
 
 include $(top_srcdir)/../../../automake/subdirs.am
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/clock/Makefile.am
index e99a32f08a..1a849a2266 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/clock/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = ${ARCH}/clock.rel
 
 ## C sources
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/Makefile.am
index 3f64451004..50eb2730fc 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/console-generic/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = ${ARCH}/console-generic.rel
 
 ## C sources
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/cpm/Makefile.am
index da26052a5d..b3e58a6ca1 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/cpm/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/cpm/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = ${ARCH}/cp.rel
 
 ## C sources
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am
index 1b00b276e7..f89204edd7 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/exceptions/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/exceptions.rel
 
 C_FILES = raw_exception.c
@@ -18,11 +17,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 +=
 #
@@ -30,13 +24,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/mpc8xx/mmu/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/mmu/Makefile.am
index f62c09a0a6..675da4a183 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/mmu/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/mmu/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = ${ARCH}/mmu.rel
 
 ## C sources
diff --git a/c/src/lib/libcpu/powerpc/mpc8xx/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc8xx/timer/Makefile.am
index 109bafeac1..3d413c3575 100644
--- a/c/src/lib/libcpu/powerpc/mpc8xx/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc8xx/timer/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = ${ARCH}/timer.rel
 
 ## C sources
diff --git a/c/src/lib/libcpu/powerpc/ppc403/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/Makefile.am
index a1d607dad2..605b1a86b4 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 if ppc403
 SUBDIRS = console clock timer vectors ictrl
 endif
diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am
index 8a8c4a8863..c756e7051d 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/clock.rel
 
 C_FILES = clock.c
diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am
index 007abbf73e..428b1e8700 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/console.rel
 
 if ppc403
diff --git a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
index 0e2e055466..13ec3b171a 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/ictrl.rel
 
 C_FILES = ictrl.c
@@ -14,11 +13,6 @@ ictrl_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
@@ -26,13 +20,21 @@ $(PROJECT_INCLUDE)/%.h: %.h
 $(PGM): $(ictrl_rel_OBJECTS)
 	$(make-rel)
 
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
-    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-
 all-local: $(ARCH) $(ictrl_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(PGM)
 
 EXTRA_DIST = ictrl.c ictrl.h
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
+$(PROJECT_INCLUDE)/ictrl.h: ictrl.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ictrl.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/ictrl.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am
index 4babeaccf4..ece1756432 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/timer.rel
 
 C_FILES = timer.c
diff --git a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/tty_drv/Makefile.am
index ae651145c6..86f3d2802b 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/tty_drv/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/tty_drv/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = $(ARCH)/tty_drv.rel
 
 include_HEADERS = tty_drv.h
@@ -27,4 +26,15 @@ all-local: $(ARCH) $(tty_drv_rel_OBJECTS) $(PGM)
 
 EXTRA_DIST = tty_drv.c tty_drv.h
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)
+	@: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
+$(PROJECT_INCLUDE)/tty_drv.h: tty_drv.h $(PROJECT_INCLUDE)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tty_drv.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/tty_drv.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am
index 839bdb3721..53485216b8 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 PGM = ${ARCH}/vectors.rel
 
 ## Assembly sources
diff --git a/c/src/lib/libcpu/powerpc/shared/Makefile.am b/c/src/lib/libcpu/powerpc/shared/Makefile.am
index 2eb44aa4de..c213e23c20 100644
--- a/c/src/lib/libcpu/powerpc/shared/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/shared/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 SUBDIRS = include src
 
 include $(top_srcdir)/../../../automake/subdirs.am
diff --git a/c/src/lib/libcpu/powerpc/shared/include/Makefile.am b/c/src/lib/libcpu/powerpc/shared/include/Makefile.am
index f06b756d2b..edcfc8150f 100644
--- a/c/src/lib/libcpu/powerpc/shared/include/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/shared/include/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 C_FILES = cpuIdent.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
@@ -25,19 +24,45 @@ LIB = $(ARCH)/libcpuspec.a
 $(LIB): $(OBJS)
 	$(make-library)
 
-$(PROJECT_INCLUDE)/libcpu:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/libcpu/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \
-    $(include_libcpu_HEADERS:%=$(PROJECT_INCLUDE)/libcpu/%)
-
 all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
 
 .PRECIOUS: $(LIB)
 
 EXTRA_DIST = cpuIdent.c
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/libcpu/$(dirstamp):
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/libcpu
+	@: > $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+
+$(PROJECT_INCLUDE)/libcpu/spr.h: spr.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/spr.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/spr.h
+
+$(PROJECT_INCLUDE)/libcpu/io.h: io.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/io.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/io.h
+
+$(PROJECT_INCLUDE)/libcpu/mmu.h: mmu.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/mmu.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/mmu.h
+
+$(PROJECT_INCLUDE)/libcpu/page.h: page.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/page.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/page.h
+
+$(PROJECT_INCLUDE)/libcpu/byteorder.h: byteorder.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/byteorder.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/byteorder.h
+
+$(PROJECT_INCLUDE)/libcpu/pgtable.h: pgtable.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/pgtable.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/pgtable.h
+
+$(PROJECT_INCLUDE)/libcpu/cpuIdent.h: cpuIdent.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpuIdent.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpuIdent.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/shared/src/Makefile.am b/c/src/lib/libcpu/powerpc/shared/src/Makefile.am
index ed90307313..cf52541861 100644
--- a/c/src/lib/libcpu/powerpc/shared/src/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/shared/src/Makefile.am
@@ -2,7 +2,6 @@
 ## $Id$
 ##
 
-
 VPATH = @srcdir@:@srcdir@/../../../shared/src
 
 C_FILES = cache.c cache_aligned_malloc.c cache_manager.c stack.c
@@ -19,22 +18,32 @@ 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
+
+$(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
+
+$(PROJECT_INCLUDE)/libcpu/stackTrace.h: stackTrace.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/stackTrace.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/stackTrace.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am b/c/src/lib/libcpu/powerpc/wrapup/Makefile.am
index 20e1e0b706..74cc585bc1 100644
--- a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/wrapup/Makefile.am
@@ -2,15 +2,13 @@
 ## $Id$
 ##
 
-
 GENERIC_FILES = shared
 
 # Use two variables so that I can make two ar command.
 # So far FAMILY_OBJS is empty and ar dislike it...
 CPU_SPECIFIC_OBJS = $(wildcard ../$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.$(OBJEXT))
-FAMILY_OBJS = \
-    $(wildcard ../shared/$(ARCH)/*.$(OBJEXT) ../shared/*/$(ARCH)/*.$(OBJEXT) \
-	../mpc6xx/*/$(ARCH)/*.$(OBJEXT))
+FAMILY_OBJS = $(wildcard ../shared/$(ARCH)/*.$(OBJEXT) \
+    ../shared/*/$(ARCH)/*.$(OBJEXT) ../mpc6xx/*/$(ARCH)/*.$(OBJEXT))
 
 LIB = $(ARCH)/libcpu.a