2003-11-23 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* Makefile.am: Don't use gmake rules for preinstallation.

28 files changed, 486 insertions, 288 deletions

diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog
index e1f7a65431..909f305e25 100644
--- a/cpukit/score/cpu/arm/ChangeLog
+++ b/cpukit/score/cpu/arm/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Don't use gmake rules for preinstallation.
+
 2003-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am
index 92e9dc3924..65d2161d1f 100644
--- a/cpukit/score/cpu/arm/Makefile.am
+++ b/cpukit/score/cpu/arm/Makefile.am
@@ -8,29 +8,11 @@ include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score:
-	$(mkinstalldirs) $@
-
 include_HEADERS = asm.h
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = \
-    rtems/score/cpu.h \
-    rtems/score/cpu_asm.h \
-    rtems/score/arm.h  \
-    rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
-    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
+include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/cpu_asm.h \
+    rtems/score/arm.h rtems/score/types.h
 
 C_FILES = cpu.c
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -48,4 +30,30 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
 
 EXTRA_DIST = cpu.c cpu_asm.S
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/asm.h: asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
+
+$(PROJECT_INCLUDE)/rtems/score:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
+
+$(PROJECT_INCLUDE)/rtems/score/arm.h: rtems/score/arm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/arm.h
+
+$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/c4x/ChangeLog b/cpukit/score/cpu/c4x/ChangeLog
index 3cb95eca8f..f6a23f6606 100644
--- a/cpukit/score/cpu/c4x/ChangeLog
+++ b/cpukit/score/cpu/c4x/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Don't use gmake rules for preinstallation.
+
 2003-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/cpukit/score/cpu/c4x/Makefile.am b/cpukit/score/cpu/c4x/Makefile.am
index aa4d738df2..d409b8bf2d 100644
--- a/cpukit/score/cpu/c4x/Makefile.am
+++ b/cpukit/score/cpu/c4x/Makefile.am
@@ -8,29 +8,11 @@ include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score:
-	$(mkinstalldirs) $@
-
 include_HEADERS = asm.h c4xio.h
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = \
-    rtems/score/cpu.h \
-    rtems/score/c4x.h \
-    rtems/score/types.h \
-    rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
-    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
+include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/c4x.h \
+    rtems/score/types.h rtems/score/cpu_asm.h
 
 C_FILES = cpu.c irq.c
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -48,4 +30,34 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
 
 EXTRA_DIST = cpu.c irq.c cpu_asm.S
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/asm.h: asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
+
+$(PROJECT_INCLUDE)/c4xio.h: c4xio.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/c4xio.h
+
+$(PROJECT_INCLUDE)/rtems/score:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/score/c4x.h: rtems/score/c4x.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/c4x.h
+
+$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
+
+$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/h8300/ChangeLog b/cpukit/score/cpu/h8300/ChangeLog
index 6b02f26e48..f29b5083d6 100644
--- a/cpukit/score/cpu/h8300/ChangeLog
+++ b/cpukit/score/cpu/h8300/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Don't use gmake rules for preinstallation.
+
 2003-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/cpukit/score/cpu/h8300/Makefile.am b/cpukit/score/cpu/h8300/Makefile.am
index 221b211011..71214c3ad2 100644
--- a/cpukit/score/cpu/h8300/Makefile.am
+++ b/cpukit/score/cpu/h8300/Makefile.am
@@ -8,28 +8,11 @@ include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score:
-	$(mkinstalldirs) $@
-
 include_HEADERS = asm.h
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = \
-    rtems/score/cpu.h \
-    rtems/score/h8300.h \
+include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/h8300.h \
     rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
-    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -47,4 +30,26 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
 
 EXTRA_DIST = cpu.c cpu_asm.S
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/asm.h: asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
+
+$(PROJECT_INCLUDE)/rtems/score:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/score/h8300.h: rtems/score/h8300.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/h8300.h
+
+$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/i386/ChangeLog b/cpukit/score/cpu/i386/ChangeLog
index f082f38fb2..ddf29ee3c3 100644
--- a/cpukit/score/cpu/i386/ChangeLog
+++ b/cpukit/score/cpu/i386/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Don't use gmake rules for preinstallation.
+
 2003-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/cpukit/score/cpu/i386/Makefile.am b/cpukit/score/cpu/i386/Makefile.am
index 8364de60a8..f08df6d336 100644
--- a/cpukit/score/cpu/i386/Makefile.am
+++ b/cpukit/score/cpu/i386/Makefile.am
@@ -8,33 +8,13 @@ include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score:
-	$(mkinstalldirs) $@
-
 include_HEADERS= asm.h
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = \
-    rtems/score/cpu.h \
-    rtems/score/i386.h \
-    rtems/score/types.h \
-    rtems/score/interrupts.h \
-    rtems/score/registers.h \
+include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/i386.h \
+    rtems/score/types.h rtems/score/interrupts.h rtems/score/registers.h \
     rtems/score/idtr.h
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
-    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
-
 LIB = $(ARCH)/libscorecpu.a
 
 C_FILES = cpu.c
@@ -51,4 +31,38 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
 
 EXTRA_DIST = cpu.c cpu_asm.S
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/asm.h: asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
+
+$(PROJECT_INCLUDE)/rtems/score:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/score/i386.h: rtems/score/i386.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/i386.h
+
+$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
+
+$(PROJECT_INCLUDE)/rtems/score/interrupts.h: rtems/score/interrupts.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/interrupts.h
+
+$(PROJECT_INCLUDE)/rtems/score/registers.h: rtems/score/registers.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/registers.h
+
+$(PROJECT_INCLUDE)/rtems/score/idtr.h: rtems/score/idtr.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/idtr.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/i960/ChangeLog b/cpukit/score/cpu/i960/ChangeLog
index 4a51f155eb..dac2a20a13 100644
--- a/cpukit/score/cpu/i960/ChangeLog
+++ b/cpukit/score/cpu/i960/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Don't use gmake rules for preinstallation.
+
 2003-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/cpukit/score/cpu/i960/Makefile.am b/cpukit/score/cpu/i960/Makefile.am
index c0376aea65..bb44d0133e 100644
--- a/cpukit/score/cpu/i960/Makefile.am
+++ b/cpukit/score/cpu/i960/Makefile.am
@@ -8,28 +8,11 @@ include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score:
-	$(mkinstalldirs) $@
-
 include_HEADERS = asm.h
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = \
-    rtems/score/cpu.h \
-    rtems/score/i960.h \
+include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/i960.h \
     rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
-    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -47,4 +30,26 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
 
 EXTRA_DIST = cpu.c cpu_asm.S i960RP.h
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/asm.h: asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
+
+$(PROJECT_INCLUDE)/rtems/score:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/score/i960.h: rtems/score/i960.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/i960.h
+
+$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog
index a29929b8af..505bb0ebf4 100644
--- a/cpukit/score/cpu/m68k/ChangeLog
+++ b/cpukit/score/cpu/m68k/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Don't use gmake rules for preinstallation.
+
 2003-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am
index 8dc021be85..9d25290c5e 100644
--- a/cpukit/score/cpu/m68k/Makefile.am
+++ b/cpukit/score/cpu/m68k/Makefile.am
@@ -8,28 +8,11 @@ include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score:
-	$(mkinstalldirs) $@
-
 include_HEADERS = asm.h m68302.h m68360.h qsm.h sim.h
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = \
-    rtems/score/cpu.h \
-    rtems/score/m68k.h \
+include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/m68k.h \
     rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
-    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -47,4 +30,42 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
 
 EXTRA_DIST = cpu.c cpu_asm.S
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/asm.h: asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
+
+$(PROJECT_INCLUDE)/m68302.h: m68302.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68302.h
+
+$(PROJECT_INCLUDE)/m68360.h: m68360.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/m68360.h
+
+$(PROJECT_INCLUDE)/qsm.h: qsm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/qsm.h
+
+$(PROJECT_INCLUDE)/sim.h: sim.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/sim.h
+
+$(PROJECT_INCLUDE)/rtems/score:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/score/m68k.h: rtems/score/m68k.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/m68k.h
+
+$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog
index 5c0cb48e52..77837ae1af 100644
--- a/cpukit/score/cpu/mips/ChangeLog
+++ b/cpukit/score/cpu/mips/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Don't use gmake rules for preinstallation.
+
 2003-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/cpukit/score/cpu/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am
index ef6d7324f7..047ba5b7b2 100644
--- a/cpukit/score/cpu/mips/Makefile.am
+++ b/cpukit/score/cpu/mips/Makefile.am
@@ -8,28 +8,11 @@ include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score:
-	$(mkinstalldirs) $@
-
 include_HEADERS = asm.h idtcpu.h iregdef.h
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = \
-	rtems/score/cpu.h \
-	rtems/score/mips.h \
-	rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
-    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
+include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/mips.h \
+    rtems/score/types.h
 
 C_FILES = cpu.c
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -47,4 +30,34 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
 
 EXTRA_DIST = cpu.c cpu_asm.S
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/asm.h: asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
+
+$(PROJECT_INCLUDE)/idtcpu.h: idtcpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/idtcpu.h
+
+$(PROJECT_INCLUDE)/iregdef.h: iregdef.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/iregdef.h
+
+$(PROJECT_INCLUDE)/rtems/score:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/score/mips.h: rtems/score/mips.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/mips.h
+
+$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/mips64orion/ChangeLog b/cpukit/score/cpu/mips64orion/ChangeLog
index be90ac11bf..1c507f56e5 100644
--- a/cpukit/score/cpu/mips64orion/ChangeLog
+++ b/cpukit/score/cpu/mips64orion/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Don't use gmake rules for preinstallation.
+
 2003-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/cpukit/score/cpu/mips64orion/Makefile.am b/cpukit/score/cpu/mips64orion/Makefile.am
index ccdab2bda9..55be78baed 100644
--- a/cpukit/score/cpu/mips64orion/Makefile.am
+++ b/cpukit/score/cpu/mips64orion/Makefile.am
@@ -8,28 +8,11 @@ include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score:
-	$(mkinstalldirs) $@
-
 include_HEADERS = asm.h cpu_asm.h idtcpu.h idtmon.h iregdef.h
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = \
-    rtems/score/cpu.h \
-    rtems/score/mips64orion.h \
+include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/mips64orion.h \
     rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
-    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -47,4 +30,42 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
 
 EXTRA_DIST = cpu.c cpu_asm.S
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/asm.h: asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
+
+$(PROJECT_INCLUDE)/cpu_asm.h: cpu_asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/cpu_asm.h
+
+$(PROJECT_INCLUDE)/idtcpu.h: idtcpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/idtcpu.h
+
+$(PROJECT_INCLUDE)/idtmon.h: idtmon.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/idtmon.h
+
+$(PROJECT_INCLUDE)/iregdef.h: iregdef.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/iregdef.h
+
+$(PROJECT_INCLUDE)/rtems/score:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/score/mips64orion.h: rtems/score/mips64orion.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/mips64orion.h
+
+$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/no_cpu/ChangeLog b/cpukit/score/cpu/no_cpu/ChangeLog
index af167a8fbf..d0a6ce9e96 100644
--- a/cpukit/score/cpu/no_cpu/ChangeLog
+++ b/cpukit/score/cpu/no_cpu/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Don't use gmake rules for preinstallation.
+
 2003-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/cpukit/score/cpu/no_cpu/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am
index 35c5a9fe70..2bfe798c90 100644
--- a/cpukit/score/cpu/no_cpu/Makefile.am
+++ b/cpukit/score/cpu/no_cpu/Makefile.am
@@ -8,29 +8,11 @@ include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score:
-	$(mkinstalldirs) $@
-
 include_HEADERS = asm.h
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = \
-    rtems/score/cpu.h \
-    rtems/score/no_cpu.h \
-    rtems/score/cpu_asm.h \
-    rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
-    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
+include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/no_cpu.h \
+    rtems/score/cpu_asm.h rtems/score/types.h
 
 C_FILES = cpu.c cpu_asm.c
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -45,4 +27,30 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
 
 EXTRA_DIST = cpu.c cpu_asm.c
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/asm.h: asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
+
+$(PROJECT_INCLUDE)/rtems/score:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/score/no_cpu.h: rtems/score/no_cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/no_cpu.h
+
+$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
+
+$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/or32/ChangeLog b/cpukit/score/cpu/or32/ChangeLog
index 48428ca685..df117e4b67 100644
--- a/cpukit/score/cpu/or32/ChangeLog
+++ b/cpukit/score/cpu/or32/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Don't use gmake rules for preinstallation.
+
 2003-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/cpukit/score/cpu/or32/Makefile.am b/cpukit/score/cpu/or32/Makefile.am
index 092928184d..541ab8c784 100644
--- a/cpukit/score/cpu/or32/Makefile.am
+++ b/cpukit/score/cpu/or32/Makefile.am
@@ -8,29 +8,11 @@ include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score:
-	$(mkinstalldirs) $@
-
 include_HEADERS= asm.h
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = \
-    rtems/score/cpu.h \
-    rtems/score/types.h \
-    rtems/score/or32.h \
-    rtems/score/cpu_asm.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
-    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
+include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/types.h \
+    rtems/score/or32.h rtems/score/cpu_asm.h
 
 C_FILES = cpu.c cpu_asm.c
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -45,4 +27,30 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
 
 EXTRA_DIST = cpu.c cpu_asm.c
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/asm.h: asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
+
+$(PROJECT_INCLUDE)/rtems/score:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
+
+$(PROJECT_INCLUDE)/rtems/score/or32.h: rtems/score/or32.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/or32.h
+
+$(PROJECT_INCLUDE)/rtems/score/cpu_asm.h: rtems/score/cpu_asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu_asm.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog
index 1737b4b3a3..c7d889aa07 100644
--- a/cpukit/score/cpu/powerpc/ChangeLog
+++ b/cpukit/score/cpu/powerpc/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Don't use gmake rules for preinstallation.
+
 2003-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/cpukit/score/cpu/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am
index e77b61d4d6..134ac7d868 100644
--- a/cpukit/score/cpu/powerpc/Makefile.am
+++ b/cpukit/score/cpu/powerpc/Makefile.am
@@ -8,58 +8,21 @@ include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score:
-	$(mkinstalldirs) $@
-
 include_HEADERS = asm.h
-PREINSTALL_FILES = $(PROJECT_INCLUDE) \
-    $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = \
-  rtems/score/ppc.h \
-  rtems/score/types.h
+include_rtems_score_HEADERS = rtems/score/ppc.h rtems/score/types.h
 include_rtems_score_HEADERS += rtems/score/cpu.h
 
-$(PROJECT_INCLUDE)/rtems/old-exceptions:
-	$(mkinstalldirs) $@
-
 include_rtems_old_exceptionsdir = $(includedir)/rtems/old-exceptions
 include_rtems_old_exceptions_HEADERS = rtems/old-exceptions/cpu.h
 
-$(PROJECT_INCLUDE)/rtems/new-exceptions:
-	$(mkinstalldirs) $@
-
 include_rtems_new_exceptionsdir = $(includedir)/rtems/new-exceptions
 include_rtems_new_exceptions_HEADERS = rtems/new-exceptions/cpu.h
 
-$(PROJECT_INCLUDE)/rtems/powerpc:
-	$(mkinstalldirs) $@
-
 include_rtems_powerpcdir = $(includedir)/rtems/powerpc
 include_rtems_powerpc_HEADERS = rtems/powerpc/registers.h
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
-    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
-
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/old-exceptions \
-    $(include_rtems_old_exceptions_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
-
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/new-exceptions \
-    $(include_rtems_new_exceptions_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
-
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc \
-    $(include_rtems_powerpc_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
-
 C_FILES = # cpu.c
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
 
@@ -72,4 +35,50 @@ $(LIB): $(OBJS)
 all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
     $(TMPINSTALL_FILES)
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/asm.h: asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
+
+$(PROJECT_INCLUDE)/rtems/score:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score/ppc.h: rtems/score/ppc.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ppc.h
+
+$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
+
+$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/old-exceptions:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/old-exceptions
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/old-exceptions
+
+$(PROJECT_INCLUDE)/rtems/old-exceptions/cpu.h: rtems/old-exceptions/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/old-exceptions/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/new-exceptions:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/new-exceptions
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/new-exceptions
+
+$(PROJECT_INCLUDE)/rtems/new-exceptions/cpu.h: rtems/new-exceptions/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/new-exceptions/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/powerpc:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/powerpc
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc
+
+$(PROJECT_INCLUDE)/rtems/powerpc/registers.h: rtems/powerpc/registers.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/registers.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/sh/ChangeLog b/cpukit/score/cpu/sh/ChangeLog
index 8d9efb4937..26f9f12991 100644
--- a/cpukit/score/cpu/sh/ChangeLog
+++ b/cpukit/score/cpu/sh/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Don't use gmake rules for preinstallation.
+
 2003-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/cpukit/score/cpu/sh/Makefile.am b/cpukit/score/cpu/sh/Makefile.am
index fb0b6ec416..bffdcbea26 100644
--- a/cpukit/score/cpu/sh/Makefile.am
+++ b/cpukit/score/cpu/sh/Makefile.am
@@ -8,29 +8,11 @@ include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score:
-	$(mkinstalldirs) $@
-
 include_HEADERS= asm.h
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = \
-    rtems/score/cpu.h \
-    rtems/score/types.h \
-    rtems/score/sh.h \
-    rtems/score/sh_io.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
-    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
+include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/types.h \
+    rtems/score/sh.h rtems/score/sh_io.h
 
 C_FILES = cpu.c
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -45,4 +27,30 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
 
 EXTRA_DIST = cpu.c
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/asm.h: asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
+
+$(PROJECT_INCLUDE)/rtems/score:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
+
+$(PROJECT_INCLUDE)/rtems/score/sh.h: rtems/score/sh.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh.h
+
+$(PROJECT_INCLUDE)/rtems/score/sh_io.h: rtems/score/sh_io.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh_io.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/sparc/ChangeLog b/cpukit/score/cpu/sparc/ChangeLog
index bf9bc50f2a..f071b460e4 100644
--- a/cpukit/score/cpu/sparc/ChangeLog
+++ b/cpukit/score/cpu/sparc/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Don't use gmake rules for preinstallation.
+
 2003-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am
index 3a7c07ca91..cfc8079de2 100644
--- a/cpukit/score/cpu/sparc/Makefile.am
+++ b/cpukit/score/cpu/sparc/Makefile.am
@@ -8,28 +8,11 @@ include $(top_srcdir)/../../../automake/multilib.am
 include $(top_srcdir)/../../../automake/compile.am
 include $(top_srcdir)/../../../automake/lib.am
 
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score:
-	$(mkinstalldirs) $@
-
 include_HEADERS= asm.h
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
 
 include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = \
-    rtems/score/sparc.h \
-    rtems/score/cpu.h \
+include_rtems_score_HEADERS = rtems/score/sparc.h rtems/score/cpu.h \
     rtems/score/types.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
-    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -47,4 +30,26 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
 
 EXTRA_DIST = cpu.c cpu_asm.S
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/asm.h: asm.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
+
+$(PROJECT_INCLUDE)/rtems/score:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score/sparc.h: rtems/score/sparc.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sparc.h
+
+$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
+
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/score/cpu/unix/ChangeLog b/cpukit/score/cpu/unix/ChangeLog
index 236b6b5b3c..7525fffa4b 100644
--- a/cpukit/score/cpu/unix/ChangeLog
+++ b/cpukit/score/cpu/unix/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-23	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* Makefile.am: Don't use gmake rules for preinstallation.
+
 2003-10-21	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* configure.ac: Remove RTEMS_CANONICAL_HOST.
diff --git a/cpukit/score/cpu/unix/Makefile.am b/cpukit/score/cpu/unix/Makefile.am
index 7d358443c2..12fb64edff 100644
--- a/cpukit/score/cpu/unix/Makefile.am
+++ b/cpukit/score/cpu/unix/Makefile.am
@@ -10,26 +10,9 @@ include $(top_srcdir)/../../../automake/lib.am
 
 AM_CPPFLAGS += -DCPU_SYNC_IO $(LIBC_DEFINES)
 
-$(PROJECT_INCLUDE)/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE):
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score:
-	$(mkinstalldirs) $@
-
 include_rtems_scoredir = $(includedir)/rtems/score
-include_rtems_score_HEADERS = \
-    rtems/score/types.h \
-    rtems/score/cpu.h \
-    rtems/score/unix.h \
-    rtems/score/unixsize.h
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
-    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
+include_rtems_score_HEADERS = rtems/score/types.h rtems/score/cpu.h \
+    rtems/score/unix.h rtems/score/unixsize.h
 
 C_FILES = cpu.c
 OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
@@ -44,4 +27,26 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(LIB) \
 
 EXTRA_DIST = cpu.c
 
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/rtems/score:
+	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score
+
+$(PROJECT_INCLUDE)/rtems/score/types.h: rtems/score/types.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/types.h
+
+$(PROJECT_INCLUDE)/rtems/score/cpu.h: rtems/score/cpu.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/cpu.h
+
+$(PROJECT_INCLUDE)/rtems/score/unix.h: rtems/score/unix.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/unix.h
+
+$(PROJECT_INCLUDE)/rtems/score/unixsize.h: rtems/score/unixsize.h
+	$(INSTALL_DATA) $< $@
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/unixsize.h
+
 include $(top_srcdir)/../../../automake/local.am