17 files changed, 192 insertions, 249 deletions
diff --git a/cpukit/libmisc/dummy/Makefile.am b/cpukit/libmisc/dummy/Makefile.am
index 5d3026cc53..ba67d1a561 100644
--- a/cpukit/libmisc/dummy/Makefile.am
+++ b/cpukit/libmisc/dummy/Makefile.am
@@ -1,41 +1,36 @@
-#
-#  $Id$
-#
+## 
+## $Id$
+## 
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
 PGMNAME = dummy
-PGM = ${ARCH}/$(PGMNAME).rel
+PGM = $(ARCH)/$(PGMNAME).rel
 
-# C source names, if any, go here -- minus the .c
 C_FILES = dummy.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-SRCS = $(C_FILES)
 OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-TMPINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems \
-$(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel
-
-$(PROJECT_INCLUDE)/rtems:
-	@$(mkinstalldirs) $@
+include $(top_srcdir)/../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-${PGM}: ${OBJS}
+$(PGM): $(OBJS)
 	$(make-rel)
 
 $(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel: $(PGM)
 	$(INSTALL_DATA) $< $@
 
-all: ${ARCH} $(TMPINSTALL_FILES)
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(PGMNAME)$(LIB_VARIANT).rel
+
+all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+EXTRA_DIST = README dummy.c
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/dumpbuf/Makefile.am b/cpukit/libmisc/dumpbuf/Makefile.am
index 634b36b860..7bcd22e46e 100644
--- a/cpukit/libmisc/dumpbuf/Makefile.am
+++ b/cpukit/libmisc/dumpbuf/Makefile.am
@@ -1,28 +1,21 @@
-##
-##  $Id$
-##
+## 
+## $Id$
+## 
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
 LIBNAME = libdumpbuf-tmp
-LIB = ${ARCH}/$(LIBNAME).a
+LIB = $(ARCH)/$(LIBNAME).a
 
-# C source names, if any, go here -- minus the .c
 C_FILES = dumpbuf.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = dumpbuf.h
-noinst_HEADERS = $(H_FILES)
 
-SRCS = $(C_FILES) $(H_FILES)
 OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems \
-$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+include $(top_srcdir)/../../../automake/lib.am
 
 $(PROJECT_INCLUDE)/rtems:
 	@$(mkinstalldirs) $@
@@ -33,11 +26,16 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
 # (OPTIONAL) Add local stuff here using +=
 #
 
-${LIB}: ${OBJS}
+$(LIB): $(OBJS)
 	$(make-library)
 
-all: ${ARCH} $(PREINSTALL_FILES) $(LIB) $(TMPINSTALL_FILES)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/%)
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+
+.PRECIOUS: $(LIB)
 
-EXTRA_DIST += $(C_FILES)
+EXTRA_DIST = dumpbuf.c dumpbuf.h
 
 include $(top_srcdir)/../../../automake/local.am
diff --git a/cpukit/libmisc/monitor/Makefile.am b/cpukit/libmisc/monitor/Makefile.am
index 03e63cb0bd..fa9f98db9d 100644
--- a/cpukit/libmisc/monitor/Makefile.am
+++ b/cpukit/libmisc/monitor/Makefile.am
@@ -7,7 +7,6 @@ AUTOMAKE_OPTIONS = foreign 1.4
 LIBNAME = libmonitor-tmp
 LIB = ${ARCH}/$(LIBNAME).a
 
-# C source names, if any, go here -- minus the .c
 # We only build multiprocessing related files if HAS_MP was defined
 MP_C_FILES = mon-mpci.c
 
diff --git a/cpukit/librpc/src/Makefile.am b/cpukit/librpc/src/Makefile.am
index b07e3de004..efa6a1cadb 100644
--- a/cpukit/librpc/src/Makefile.am
+++ b/cpukit/librpc/src/Makefile.am
@@ -7,7 +7,6 @@ AUTOMAKE_OPTIONS = foreign 1.4
 LIBNAME = librpc
 LIB = ${ARCH}/${LIBNAME}.a
 
-# C and C++ source names, if any, go here -- minus the .c or .cc
 C_FILES = rpc_callmsg.c rpc_prot.c svc.c svc_auth.c svc_udp.c xdr.c \
     xdr_array.c xdr_mem.c
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
diff --git a/cpukit/score/cpu/a29k/Makefile.am b/cpukit/score/cpu/a29k/Makefile.am
index ee69311ec8..a740e396a3 100644
--- a/cpukit/score/cpu/a29k/Makefile.am
+++ b/cpukit/score/cpu/a29k/Makefile.am
@@ -10,20 +10,16 @@ include $(top_srcdir)/../../../../../../automake/lib.am
 
 SUBDIRS = rtems
 
-# C source names
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = amd.ah asm.h cpu_asm.h pswmacro.ah register.ah
-noinst_HEADERS = $(H_FILES)
 
-# S source names
 S_FILES = cpu_asm.S sig.S
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(H_FILES:%=$(PROJECT_INCLUDE)/%)
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -31,23 +27,26 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
-
 $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
 	$(INSTALL_DATA) $< $@
 
 REL = $(ARCH)/rtems-cpu.rel
 
-$(REL): $(C_O_FILES) $(S_O_FILES)
+rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES)
+
+$(REL): $(rtems_cpu_rel_OBJECTS)
 	$(make-rel)
 
-all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(REL)
 
-EXTRA_DIST = \
-cpu.c \
-cpu_asm.S sig.S \
-rtems.c
+EXTRA_DIST = amd.ah asm.h cpu.c cpu_asm.S pswmacro.ah register.ah rtems.c \
+    sig.S
 
 include $(top_srcdir)/../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/cpukit/score/cpu/hppa1.1/Makefile.am b/cpukit/score/cpu/hppa1.1/Makefile.am
index 2adb4f8eed..882f9ca597 100644
--- a/cpukit/score/cpu/hppa1.1/Makefile.am
+++ b/cpukit/score/cpu/hppa1.1/Makefile.am
@@ -5,25 +5,16 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../../../automake/lib.am
-
 SUBDIRS = rtems
 
-# C source names
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-## H_FILES =
-## noinst_HEADERS = $(H_FILES)
-
-# S source names
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(H_FILES:%=$(PROJECT_INCLUDE)/%)
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -31,23 +22,25 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
-
 $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
 	$(INSTALL_DATA) $< $@
 
 REL = $(ARCH)/rtems-cpu.rel
 
-$(REL): $(C_O_FILES) $(S_O_FILES)
+rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES)
+
+$(REL): $(rtems_cpu_rel_OBJECTS)
 	$(make-rel)
 
-all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(REL)
 
-EXTRA_DIST = \
-cpu.c \
-cpu_asm.S \
-rtems.S
+EXTRA_DIST = cpu.c cpu_asm.S rtems.S
 
 include $(top_srcdir)/../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/cpukit/score/cpu/i386/Makefile.am b/cpukit/score/cpu/i386/Makefile.am
index 4e989e3488..ff1f7dd610 100644
--- a/cpukit/score/cpu/i386/Makefile.am
+++ b/cpukit/score/cpu/i386/Makefile.am
@@ -5,25 +5,22 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../../../automake/lib.am
-
 SUBDIRS = rtems
 
-# C source names
+REL = $(ARCH)/rtems-cpu.rel
+
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = asm.h
-noinst_HEADERS = $(H_FILES)
 
-# S source names
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
+
+rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(H_FILES:%=$(PROJECT_INCLUDE)/%)
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -31,23 +28,21 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
-
 $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
 	$(INSTALL_DATA) $< $@
 
-REL = $(ARCH)/rtems-cpu.rel
-
-$(REL): $(C_O_FILES) $(S_O_FILES)
+$(REL): $(rtems_cpu_rel_OBJECTS)
 	$(make-rel)
 
-all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(REL)
 
-EXTRA_DIST = \
-cpu.c \
-cpu_asm.S \
-rtems.S
+EXTRA_DIST = asm.h cpu.c cpu_asm.S rtems.S
 
 include $(top_srcdir)/../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/cpukit/score/cpu/i960/Makefile.am b/cpukit/score/cpu/i960/Makefile.am
index 5dfd2a4303..9e45e1dcd4 100644
--- a/cpukit/score/cpu/i960/Makefile.am
+++ b/cpukit/score/cpu/i960/Makefile.am
@@ -5,25 +5,18 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../../../automake/lib.am
-
 SUBDIRS = rtems
 
-# C source names
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = asm.h i960RP.h
-noinst_HEADERS = $(H_FILES)
 
-# S source names
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(H_FILES:%=$(PROJECT_INCLUDE)/%)
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -31,23 +24,25 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
-
 $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
 	$(INSTALL_DATA) $< $@
 
 REL = $(ARCH)/rtems-cpu.rel
 
-$(REL): $(C_O_FILES) $(S_O_FILES)
+rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES)
+
+$(REL): $(rtems_cpu_rel_OBJECTS)
 	$(make-rel)
 
-all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(REL)
 
-EXTRA_DIST = \
-cpu.c \
-cpu_asm.S \
-rtems.S
+EXTRA_DIST = asm.h cpu.c cpu_asm.S i960RP.h rtems.S
 
 include $(top_srcdir)/../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/cpukit/score/cpu/m68k/Makefile.am b/cpukit/score/cpu/m68k/Makefile.am
index 307eefc86e..4ff7a91ff7 100644
--- a/cpukit/score/cpu/m68k/Makefile.am
+++ b/cpukit/score/cpu/m68k/Makefile.am
@@ -5,25 +5,18 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../../../automake/lib.am
-
 SUBDIRS = rtems
 
-# C source names
 C_FILES = cpu.c memcpy.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = asm.h m68302.h m68360.h qsm.h sim.h
-noinst_HEADERS = $(H_FILES)
 
-# S source names
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(H_FILES:%=$(PROJECT_INCLUDE)/%)
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -31,23 +24,26 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
-
 $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
 	$(INSTALL_DATA) $< $@
 
 REL = $(ARCH)/rtems-cpu.rel
 
-$(REL): $(C_O_FILES) $(S_O_FILES)
+rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES)
+
+$(REL): $(rtems_cpu_rel_OBJECTS)
 	$(make-rel)
 
-all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(REL)
 
-EXTRA_DIST = \
-cpu.c memcpy.c \
-cpu_asm.S \
-rtems.S
+EXTRA_DIST = asm.h cpu.c cpu_asm.S m68302.h m68360.h memcpy.c qsm.h rtems.S \
+    sim.h
 
 include $(top_srcdir)/../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/cpukit/score/cpu/mips/Makefile.am b/cpukit/score/cpu/mips/Makefile.am
index 2909324c08..b54cb49ded 100644
--- a/cpukit/score/cpu/mips/Makefile.am
+++ b/cpukit/score/cpu/mips/Makefile.am
@@ -5,25 +5,18 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../../../automake/lib.am
-
 SUBDIRS = rtems
 
-# C source names
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = asm.h cpu_asm.h idtcpu.h idtmon.h iregdef.h
-noinst_HEADERS = $(H_FILES)
 
-# S source names
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(H_FILES:%=$(PROJECT_INCLUDE)/%)
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -31,23 +24,26 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
-
 $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
 	$(INSTALL_DATA) $< $@
 
 REL = $(ARCH)/rtems-cpu.rel
 
-$(REL): $(C_O_FILES) $(S_O_FILES)
+rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES)
+
+$(REL): $(rtems_cpu_rel_OBJECTS)
 	$(make-rel)
 
-all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(REL)
 
-EXTRA_DIST = \
-cpu.c \
-cpu_asm.S \
-rtems.c
+EXTRA_DIST = asm.h cpu.c cpu_asm.S cpu_asm.h idtcpu.h idtmon.h iregdef.h \
+    rtems.c
 
 include $(top_srcdir)/../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/cpukit/score/cpu/mips64orion/Makefile.am b/cpukit/score/cpu/mips64orion/Makefile.am
index 2909324c08..b54cb49ded 100644
--- a/cpukit/score/cpu/mips64orion/Makefile.am
+++ b/cpukit/score/cpu/mips64orion/Makefile.am
@@ -5,25 +5,18 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../../../automake/lib.am
-
 SUBDIRS = rtems
 
-# C source names
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = asm.h cpu_asm.h idtcpu.h idtmon.h iregdef.h
-noinst_HEADERS = $(H_FILES)
 
-# S source names
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(H_FILES:%=$(PROJECT_INCLUDE)/%)
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -31,23 +24,26 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
-
 $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
 	$(INSTALL_DATA) $< $@
 
 REL = $(ARCH)/rtems-cpu.rel
 
-$(REL): $(C_O_FILES) $(S_O_FILES)
+rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES)
+
+$(REL): $(rtems_cpu_rel_OBJECTS)
 	$(make-rel)
 
-all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(REL)
 
-EXTRA_DIST = \
-cpu.c \
-cpu_asm.S \
-rtems.c
+EXTRA_DIST = asm.h cpu.c cpu_asm.S cpu_asm.h idtcpu.h idtmon.h iregdef.h \
+    rtems.c
 
 include $(top_srcdir)/../../../../../../automake/subdirs.am
 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 d3ba497313..29ff8e77ff 100644
--- a/cpukit/score/cpu/no_cpu/Makefile.am
+++ b/cpukit/score/cpu/no_cpu/Makefile.am
@@ -5,25 +5,19 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../../../automake/lib.am
-
 SUBDIRS = rtems
 
-# C source names
 C_FILES = cpu.c cpu_asm.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = asm.h
-noinst_HEADERS = $(H_FILES)
 
-# S source names
-## S_FILES = cpu_asm.S
-## S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+REL = $(ARCH)/rtems-cpu.rel
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(H_FILES:%=$(PROJECT_INCLUDE)/%)
+rtems_cpu_rel_OBJECTS = $(C_O_FILES)
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -31,23 +25,21 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
-
 $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
 	$(INSTALL_DATA) $< $@
 
-REL = $(ARCH)/rtems-cpu.rel
-
-$(REL): $(C_O_FILES) $(S_O_FILES)
+$(REL): $(rtems_cpu_rel_OBJECTS)
 	$(make-rel)
 
-all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(REL)
 
-EXTRA_DIST = \
-cpu.c \
-cpu_asm.c \
-rtems.c
+EXTRA_DIST = asm.h cpu.c cpu_asm.c rtems.c
 
 include $(top_srcdir)/../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/cpukit/score/cpu/powerpc/Makefile.am b/cpukit/score/cpu/powerpc/Makefile.am
index cbddc2bca7..db1cf0888a 100644
--- a/cpukit/score/cpu/powerpc/Makefile.am
+++ b/cpukit/score/cpu/powerpc/Makefile.am
@@ -1,6 +1,6 @@
-##
+## 
 ## $Id$
-##
+## 
 
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
diff --git a/cpukit/score/cpu/sh/Makefile.am b/cpukit/score/cpu/sh/Makefile.am
index e03b4aaff3..680b7151dc 100644
--- a/cpukit/score/cpu/sh/Makefile.am
+++ b/cpukit/score/cpu/sh/Makefile.am
@@ -11,11 +11,6 @@ include $(top_srcdir)/../../../../../../automake/lib.am
 SUBDIRS = rtems
 
 H_FILES = asm.h
-noinst_HEADERS = $(H_FILES)
-
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(H_FILES:%=$(PROJECT_INCLUDE)/%)
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -23,29 +18,28 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
-
 $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
 	$(INSTALL_DATA) $< $@
 
-# C source names, if any, go here -- minus the .c
 C_FILES = cpu.c cpu_asm.c isp$(RTEMS_CPU_MODEL).c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 REL = $(ARCH)/rtems-cpu.rel
 
-$(REL): $(C_O_FILES)
+rtems_cpu_rel_OBJECTS = $(C_O_FILES)
+
+$(REL): $(rtems_cpu_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(REL)
 
-EXTRA_DIST = \
-cpu.c \
-cpu_asm.c \
-ispsh7032.c \
-ispsh7045.c \
-rtems.c
+EXTRA_DIST = asm.h cpu.c cpu_asm.c ispsh7032.c ispsh7045.c rtems.c
 
 include $(top_srcdir)/../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am
index b3c1176884..6ae4472920 100644
--- a/cpukit/score/cpu/sparc/Makefile.am
+++ b/cpukit/score/cpu/sparc/Makefile.am
@@ -5,25 +5,22 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(top_srcdir)/../../../../../../automake/lib.am
-
 SUBDIRS = rtems
 
-# C source names
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = asm.h erc32.h
-noinst_HEADERS = $(H_FILES)
 
-# S source names
 S_FILES = cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
+
+REL = $(ARCH)/rtems-cpu.rel
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(H_FILES:%=$(PROJECT_INCLUDE)/%)
+rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES)
 
 $(PROJECT_INCLUDE):
 	$(mkinstalldirs) $@
@@ -31,23 +28,21 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
-
 $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
 	$(INSTALL_DATA) $< $@
 
-REL = $(ARCH)/rtems-cpu.rel
-
-$(REL): $(C_O_FILES) $(S_O_FILES)
+$(REL): $(rtems_cpu_rel_OBJECTS)
 	$(make-rel)
 
-all-local: $(ARCH) $(ARCH)/rtems.o $(REL) $(TMPINSTALL_FILES)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%=$(PROJECT_INCLUDE)/%)
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(rtems_cpu_rel_OBJECTS) $(REL) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(REL)
 
-EXTRA_DIST = \
-cpu.c \
-cpu_asm.S \
-rtems.S
+EXTRA_DIST = asm.h cpu.c cpu_asm.S erc32.h rtems.S
 
 include $(top_srcdir)/../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/cpukit/score/cpu/unix/Makefile.am b/cpukit/score/cpu/unix/Makefile.am
index d55b67a02c..e619852a38 100644
--- a/cpukit/score/cpu/unix/Makefile.am
+++ b/cpukit/score/cpu/unix/Makefile.am
@@ -12,19 +12,21 @@ SUBDIRS = rtems
 
 AM_CPPFLAGS = -DCPU_SYNC_IO $(LIBC_DEFINES)
 
-# C source names, if any, go here -- minus the .c
 C_FILES = cpu.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 REL = $(ARCH)/rtems-cpu.rel
 
-$(REL): $(C_O_FILES)
+rtems_cpu_rel_OBJECTS = $(C_O_FILES)
+
+$(REL): $(rtems_cpu_rel_OBJECTS)
 	$(make-rel)
 
-all-local: $(ARCH) $(REL) $(TMPINSTALL_FILES)
+all-local: $(ARCH) $(rtems_cpu_rel_OBJECTS) $(REL)
+
+.PRECIOUS: $(REL)
 
-EXTRA_DIST = \
-cpu.c
+EXTRA_DIST = cpu.c
 
 include $(top_srcdir)/../../../../../../automake/subdirs.am
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/cpukit/score/src/Makefile.am b/cpukit/score/src/Makefile.am
index a75b394a85..facf739415 100644
--- a/cpukit/score/src/Makefile.am
+++ b/cpukit/score/src/Makefile.am
@@ -52,7 +52,6 @@ TOD_C_FILES = coretod.c coretodset.c coretodtickle.c coretodtoseconds.c \
 WATCHDOG_C_FILES = watchdog.c watchdogadjust.c watchdoginsert.c \
     watchdogremove.c watchdogtickle.c
 
-# C and C++ source names, if any, go here -- minus the .c or .cc
 STD_C_FILES = apiext.c chain.c $(CORE_MESSAGE_QUEUE_C_FILES) \
     $(CORE_MUTEX_C_FILES) $(CORE_SEMAPHORE_C_FILES) $(HEAP_C_FILES) interr.c \
     isr.c $(OBJECT_C_FILES) $(THREAD_C_FILES) $(THREADQ_C_FILES) \