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

	* Makefile.am: Restore file having been broken in last commit.

14 files changed, 763 insertions, 57 deletions

diff --git a/cpukit/score/cpu/arm/Makefile.am b/cpukit/score/cpu/arm/Makefile.am
index a2e0135e43..ced95dd030 100644
--- a/cpukit/score/cpu/arm/Makefile.am
+++ b/cpukit/score/cpu/arm/Makefile.am
@@ -1,4 +1,58 @@
-2003-12-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+##
+## $Id$
+##
 
-	* Makefile.am: Remove TMPINSTALL_FILES.
+ACLOCAL_AMFLAGS = -I ../../../aclocal
 
+include $(top_srcdir)/../../../automake/multilib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+include_HEADERS = asm.h
+
+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
+
+C_FILES = cpu.c
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+S_FILES = cpu_asm.S
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+
+LIB = $(ARCH)/libscorecpu.a
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(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/Makefile.am b/cpukit/score/cpu/c4x/Makefile.am
index a2e0135e43..95308ec42d 100644
--- a/cpukit/score/cpu/c4x/Makefile.am
+++ b/cpukit/score/cpu/c4x/Makefile.am
@@ -1,4 +1,62 @@
-2003-12-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+##
+## $Id$
+##
 
-	* Makefile.am: Remove TMPINSTALL_FILES.
+ACLOCAL_AMFLAGS = -I ../../../aclocal
 
+include $(top_srcdir)/../../../automake/multilib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+include_HEADERS = asm.h c4xio.h
+
+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
+
+C_FILES = cpu.c irq.c
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+S_FILES = cpu_asm.S
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+
+LIB = $(ARCH)/libscorecpu.a
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(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/Makefile.am b/cpukit/score/cpu/h8300/Makefile.am
index a2e0135e43..ac4573ae3f 100644
--- a/cpukit/score/cpu/h8300/Makefile.am
+++ b/cpukit/score/cpu/h8300/Makefile.am
@@ -1,4 +1,54 @@
-2003-12-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+##
+## $Id$
+##
 
-	* Makefile.am: Remove TMPINSTALL_FILES.
+ACLOCAL_AMFLAGS = -I ../../../aclocal
 
+include $(top_srcdir)/../../../automake/multilib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+include_HEADERS = asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/h8300.h \
+    rtems/score/types.h
+
+C_FILES = cpu.c
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+S_FILES = cpu_asm.S
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+
+LIB = $(ARCH)/libscorecpu.a
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(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/Makefile.am b/cpukit/score/cpu/i386/Makefile.am
index a2e0135e43..6c7f174b92 100644
--- a/cpukit/score/cpu/i386/Makefile.am
+++ b/cpukit/score/cpu/i386/Makefile.am
@@ -1,4 +1,67 @@
-2003-12-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+##
+## $Id$
+##
 
-	* Makefile.am: Remove TMPINSTALL_FILES.
+ACLOCAL_AMFLAGS = -I ../../../aclocal
 
+include $(top_srcdir)/../../../automake/multilib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+include_HEADERS= asm.h
+
+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 \
+    rtems/score/idtr.h
+
+LIB = $(ARCH)/libscorecpu.a
+
+C_FILES = cpu.c
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+S_FILES = cpu_asm.S
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(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/Makefile.am b/cpukit/score/cpu/i960/Makefile.am
index a2e0135e43..c2e036ed70 100644
--- a/cpukit/score/cpu/i960/Makefile.am
+++ b/cpukit/score/cpu/i960/Makefile.am
@@ -1,4 +1,54 @@
-2003-12-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+##
+## $Id$
+##
 
-	* Makefile.am: Remove TMPINSTALL_FILES.
+ACLOCAL_AMFLAGS = -I ../../../aclocal
 
+include $(top_srcdir)/../../../automake/multilib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+include_HEADERS = asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/i960.h \
+    rtems/score/types.h
+
+C_FILES = cpu.c
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+S_FILES = cpu_asm.S
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+
+LIB = $(ARCH)/libscorecpu.a
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(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/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am
index a2e0135e43..89b2bb321e 100644
--- a/cpukit/score/cpu/m68k/Makefile.am
+++ b/cpukit/score/cpu/m68k/Makefile.am
@@ -1,4 +1,70 @@
-2003-12-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+##
+## $Id$
+##
 
-	* Makefile.am: Remove TMPINSTALL_FILES.
+ACLOCAL_AMFLAGS = -I ../../../aclocal
 
+include $(top_srcdir)/../../../automake/multilib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+include_HEADERS = asm.h m68302.h m68360.h qsm.h sim.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/m68k.h \
+    rtems/score/types.h
+
+C_FILES = cpu.c
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+S_FILES = cpu_asm.S
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+
+LIB = $(ARCH)/libscorecpu.a
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(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/Makefile.am b/cpukit/score/cpu/mips/Makefile.am
index a2e0135e43..79caf61f0d 100644
--- a/cpukit/score/cpu/mips/Makefile.am
+++ b/cpukit/score/cpu/mips/Makefile.am
@@ -1,4 +1,62 @@
-2003-12-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+##
+## $Id$
+##
 
-	* Makefile.am: Remove TMPINSTALL_FILES.
+ACLOCAL_AMFLAGS = -I ../../../aclocal
 
+include $(top_srcdir)/../../../automake/multilib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+include_HEADERS = asm.h idtcpu.h iregdef.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+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))
+
+S_FILES = cpu_asm.S
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+
+LIB = $(ARCH)/libscorecpu.a
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(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/Makefile.am b/cpukit/score/cpu/mips64orion/Makefile.am
index a2e0135e43..a751bfa936 100644
--- a/cpukit/score/cpu/mips64orion/Makefile.am
+++ b/cpukit/score/cpu/mips64orion/Makefile.am
@@ -1,4 +1,70 @@
-2003-12-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+##
+## $Id$
+##
 
-	* Makefile.am: Remove TMPINSTALL_FILES.
+ACLOCAL_AMFLAGS = -I ../../../aclocal
 
+include $(top_srcdir)/../../../automake/multilib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+include_HEADERS = asm.h cpu_asm.h idtcpu.h idtmon.h iregdef.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS = rtems/score/cpu.h rtems/score/mips64orion.h \
+    rtems/score/types.h
+
+C_FILES = cpu.c
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+S_FILES = cpu_asm.S
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+
+LIB = $(ARCH)/libscorecpu.a
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(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/Makefile.am b/cpukit/score/cpu/no_cpu/Makefile.am
index a2e0135e43..a1d969cd38 100644
--- a/cpukit/score/cpu/no_cpu/Makefile.am
+++ b/cpukit/score/cpu/no_cpu/Makefile.am
@@ -1,4 +1,55 @@
-2003-12-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+##
+## $Id$
+##
 
-	* Makefile.am: Remove TMPINSTALL_FILES.
+ACLOCAL_AMFLAGS = -I ../../../aclocal
 
+include $(top_srcdir)/../../../automake/multilib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+include_HEADERS = asm.h
+
+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
+
+C_FILES = cpu.c cpu_asm.c
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+LIB = $(ARCH)/libscorecpu.a
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(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/Makefile.am b/cpukit/score/cpu/or32/Makefile.am
index a2e0135e43..6d601390d3 100644
--- a/cpukit/score/cpu/or32/Makefile.am
+++ b/cpukit/score/cpu/or32/Makefile.am
@@ -1,4 +1,55 @@
-2003-12-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+##
+## $Id$
+##
 
-	* Makefile.am: Remove TMPINSTALL_FILES.
+ACLOCAL_AMFLAGS = -I ../../../aclocal
 
+include $(top_srcdir)/../../../automake/multilib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+include_HEADERS= asm.h
+
+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
+
+C_FILES = cpu.c cpu_asm.c
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+LIB = $(ARCH)/libscorecpu.a
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(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/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am
index 376b8d0218..b866420dab 100644
--- a/cpukit/score/cpu/powerpc/Makefile.am
+++ b/cpukit/score/cpu/powerpc/Makefile.am
@@ -27,57 +27,48 @@ all-local: $(PREINSTALL_FILES)
 
 PREINSTALL_FILES =
 
-$(PROJECT_INCLUDE)/$(dirstamp):
-	@$(mkinstalldirs) $(PROJECT_INCLUDE)
-	@: > $(PROJECT_INCLUDE)/$(dirstamp)
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
-
-$(PROJECT_INCLUDE)/asm.h: asm.h $(PROJECT_INCLUDE)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/asm.h
+$(PROJECT_INCLUDE)/asm.h: asm.h
+	$(INSTALL_DATA) $< $@
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/asm.h
 
-$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
+$(PROJECT_INCLUDE)/rtems/score:
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/score
-	@: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score
 
-$(PROJECT_INCLUDE)/rtems/score/ppc.h: rtems/score/ppc.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ppc.h
+$(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 $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/types.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 $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/cpu.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/$(dirstamp):
+$(PROJECT_INCLUDE)/rtems/old-exceptions:
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/old-exceptions
-	@: > $(PROJECT_INCLUDE)/rtems/old-exceptions/$(dirstamp)
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/old-exceptions/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/old-exceptions
 
-$(PROJECT_INCLUDE)/rtems/old-exceptions/cpu.h: rtems/old-exceptions/cpu.h $(PROJECT_INCLUDE)/rtems/old-exceptions/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/old-exceptions/cpu.h
+$(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/$(dirstamp):
+$(PROJECT_INCLUDE)/rtems/new-exceptions:
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/new-exceptions
-	@: > $(PROJECT_INCLUDE)/rtems/new-exceptions/$(dirstamp)
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/new-exceptions/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/new-exceptions
 
-$(PROJECT_INCLUDE)/rtems/new-exceptions/cpu.h: rtems/new-exceptions/cpu.h $(PROJECT_INCLUDE)/rtems/new-exceptions/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/new-exceptions/cpu.h
+$(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/$(dirstamp):
+$(PROJECT_INCLUDE)/rtems/powerpc:
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems/powerpc
-	@: > $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc
 
-$(PROJECT_INCLUDE)/rtems/powerpc/registers.h: rtems/powerpc/registers.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/registers.h
+$(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/Makefile.am b/cpukit/score/cpu/sh/Makefile.am
index a2e0135e43..bd14743c5a 100644
--- a/cpukit/score/cpu/sh/Makefile.am
+++ b/cpukit/score/cpu/sh/Makefile.am
@@ -1,4 +1,55 @@
-2003-12-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+##
+## $Id$
+##
 
-	* Makefile.am: Remove TMPINSTALL_FILES.
+ACLOCAL_AMFLAGS = -I ../../../aclocal
 
+include $(top_srcdir)/../../../automake/multilib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+include_HEADERS= asm.h
+
+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
+
+C_FILES = cpu.c
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+LIB = $(ARCH)/libscorecpu.a
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(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/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am
index a2e0135e43..5b38990e7d 100644
--- a/cpukit/score/cpu/sparc/Makefile.am
+++ b/cpukit/score/cpu/sparc/Makefile.am
@@ -1,4 +1,54 @@
-2003-12-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+##
+## $Id$
+##
 
-	* Makefile.am: Remove TMPINSTALL_FILES.
+ACLOCAL_AMFLAGS = -I ../../../aclocal
 
+include $(top_srcdir)/../../../automake/multilib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+include_HEADERS= asm.h
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS = rtems/score/sparc.h rtems/score/cpu.h \
+    rtems/score/types.h
+
+C_FILES = cpu.c
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+S_FILES = cpu_asm.S
+OBJS += $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+
+LIB = $(ARCH)/libscorecpu.a
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(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/Makefile.am b/cpukit/score/cpu/unix/Makefile.am
index a2e0135e43..00ca65c31d 100644
--- a/cpukit/score/cpu/unix/Makefile.am
+++ b/cpukit/score/cpu/unix/Makefile.am
@@ -1,4 +1,51 @@
-2003-12-01	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+##
+## $Id$
+##
 
-	* Makefile.am: Remove TMPINSTALL_FILES.
+ACLOCAL_AMFLAGS = -I ../../../aclocal
 
+include $(top_srcdir)/../../../automake/multilib.am
+include $(top_srcdir)/../../../automake/compile.am
+include $(top_srcdir)/../../../automake/lib.am
+
+AM_CPPFLAGS += -DCPU_SYNC_IO $(LIBC_DEFINES)
+
+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
+
+C_FILES = cpu.c
+OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+
+LIB = $(ARCH)/libscorecpu.a
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+all-local: $(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