Patches rtems-rc-20000118-3.diff and rtems-rc-20000118-4.diff from

Ralf Corsepius <corsepiu@faw.uni-ulm.de> that contain:

    * Modifications, (minor) corrections, cleanups to most existing
      Makefile.ams
    * Adds automake support to all remaining BSPs which have not yet been
      converted to automake.
    * Makefile.am for all remaining wrapup/Makefile.ams

41 files changed, 294 insertions, 329 deletions

diff --git a/c/src/lib/libcpu/hppa1.1/clock/Makefile.am b/c/src/lib/libcpu/hppa1.1/clock/Makefile.am
index 0bd02826f5..b79f23bd38 100644
--- a/c/src/lib/libcpu/hppa1.1/clock/Makefile.am
+++ b/c/src/lib/libcpu/hppa1.1/clock/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/clock.rel
+PGM = $(ARCH)/clock.rel
 
-## C source names
 C_FILES = clock.c
 
-clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -21,8 +20,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(clock_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = clock.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/hppa1.1/include/Makefile.am b/c/src/lib/libcpu/hppa1.1/include/Makefile.am
index 5d9a1326c9..f99916c405 100644
--- a/c/src/lib/libcpu/hppa1.1/include/Makefile.am
+++ b/c/src/lib/libcpu/hppa1.1/include/Makefile.am
@@ -5,21 +5,21 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 H_FILES = runway.h semaphore.h
-noinst_HEADERS = $(H_FILES)
 
 # NOTE: Unlike other CPUS, we install into a subdirectory to avoid 
 #       file name conflicts
 
-TMPINSTALL_FILES = \
-$(PROJECT_INCLUDE)/hppa1.1 \
-$(H_FILES:%=$(PROJECT_INCLUDE)/hppa1.1/%)
-
 $(PROJECT_INCLUDE)/hppa1.1:
 	$(mkinstalldirs) $@
 
 $(PROJECT_INCLUDE)/hppa1.1/%.h: %.h
 	$(INSTALL_DATA) $@ $<
 
+TMPINSTALL_FILES += $(PROJECT_INCLUDE)/hppa1.1 \
+    $(H_FILES:%.h=$(PROJECT_INCLUDE)/hppa1.1/%.h)
+
 all-local: $(TMPINSTALL_FILES)
 
+EXTRA_DIST = runway.h semaphore.h
+
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/hppa1.1/milli/Makefile.am b/c/src/lib/libcpu/hppa1.1/milli/Makefile.am
index 3bb6ef40c6..d642f8ec89 100644
--- a/c/src/lib/libcpu/hppa1.1/milli/Makefile.am
+++ b/c/src/lib/libcpu/hppa1.1/milli/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/milli.rel
+PGM = $(ARCH)/milli.rel
 
-## Assembly source names
 S_FILES = milli.S
 
-milli_rel_OBJECTS = $(S_FILES:%.S=${ARCH}/%.o)
+milli_rel_OBJECTS = $(S_FILES:%.S=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -21,8 +20,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(milli_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(milli_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(S_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = milli.S
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am b/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am
index 9be0beb05f..96f8324776 100644
--- a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am
+++ b/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/semaphore.rel
+PGM = $(ARCH)/semaphore.rel
 
-## C source names
 C_FILES = semaphore.c
 
-semaphore_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+semaphore_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -21,8 +20,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(semaphore_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(semaphore_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = semaphore.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/hppa1.1/timer/Makefile.am b/c/src/lib/libcpu/hppa1.1/timer/Makefile.am
index 1fea2a053a..d586fcac77 100644
--- a/c/src/lib/libcpu/hppa1.1/timer/Makefile.am
+++ b/c/src/lib/libcpu/hppa1.1/timer/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/timer.rel
+PGM = $(ARCH)/timer.rel
 
-## C source names
 C_FILES = timer.c
 
-timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -21,8 +20,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = timer.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am
index 983bd47e8f..ee4972ff64 100644
--- a/c/src/lib/libcpu/i386/Makefile.am
+++ b/c/src/lib/libcpu/i386/Makefile.am
@@ -8,43 +8,41 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
 LIBNAME = libcpu
 LIB = $(ARCH)/$(LIBNAME).a
 
-# C source names, if any, go here -- minus the .c
 C_FILES = cpu.c displayCpu.c page.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = cpu.h registers.h cpuModel.h
-noinst_HEADERS = $(H_FILES)
 
-# Assembly source names, if any, go here -- minus the .s
 S_FILES = cpu_asm.S cpuModel.S
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES) $(S_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
 
-$(LIB): ${OBJS}
+$(LIB): $(OBJS)
 	$(make-library)
 
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/libcpu \
-    $(H_FILES:%=$(PROJECT_INCLUDE)/libcpu/%)
-
 $(PROJECT_INCLUDE)/libcpu:
 	$(mkinstalldirs) $@
 
 $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
-
 $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
 	$(INSTALL_DATA) $< $@
 
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/libcpu/%)
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) $(TMPINSTALL_FILES)
 
-all-local: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
+.PRECIOUS: $(LIB)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = cpu.c cpu.h cpuModel.S cpuModel.h cpu_asm.S displayCpu.c page.c \
+    registers.h
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am b/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am
index bdf83d0bc8..3e0284b63f 100644
--- a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am
+++ b/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am
@@ -4,26 +4,23 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/fpsp.rel
+PGM = $(ARCH)/fpsp.rel
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
 
-# C source names, if any, go here -- minus the .c
 C_FILES = rtems_fpsp.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = fpsp.defs
-noinst_HEADERS = fpsp.defs
 
-# Assembly source names, if any, go here -- minus the .S
 S_FILES = bindec.S binstr.S bugfix.S decbin.S do_func.S gen_except.S \
     get_op.S kernel_ex.S res_func.S round.S rtems_skel.S sacos.S sasin.S \
     satan.S satanh.S scale.S scosh.S setox.S sgetem.S sint.S slog2.S slogn.S \
     smovecr.S srem_mod.S ssin.S ssinh.S stan.S stanh.S sto_res.S stwotox.S \
     tbldo.S util.S x_bsun.S x_fline.S x_operr.S x_ovfl.S x_snan.S x_store.S \
     x_unfl.S x_unimp.S x_unsupp.S
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES) $(S_O_FILES)
 
@@ -33,15 +30,20 @@ OBJS = $(C_O_FILES) $(S_O_FILES)
 
 AM_CFLAGS += $(CFLAGS_OS_V)
 
-$(PGM): ${OBJS}
+$(PGM): $(OBJS)
 	$(make-rel)
 
 if m68040
-all-local: ${ARCH} $(PGM)
-else
-all-local:
+all-local: $(ARCH) $(OBJS) $(PGM)
 endif
 
-EXTRA_DIST = $(S_FILES) $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = README bindec.S binstr.S bugfix.S decbin.S do_func.S fpsp.defs \
+    gen_except.S get_op.S kernel_ex.S res_func.S round.S rtems_fpsp.c \
+    rtems_skel.S sacos.S sasin.S satan.S satanh.S scale.S scosh.S setox.S \
+    sgetem.S sint.S slog2.S slogn.S smovecr.S srem_mod.S ssin.S ssinh.S \
+    stan.S stanh.S sto_res.S stwotox.S tbldo.S util.S x_bsun.S x_fline.S \
+    x_operr.S x_ovfl.S x_snan.S x_store.S x_unfl.S x_unimp.S x_unsupp.S
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/clock/Makefile.am b/c/src/lib/libcpu/mips/clock/Makefile.am
index 854a2eb08c..e235a5d4de 100644
--- a/c/src/lib/libcpu/mips/clock/Makefile.am
+++ b/c/src/lib/libcpu/mips/clock/Makefile.am
@@ -4,18 +4,15 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/clock.rel
+PGM = $(ARCH)/clock.rel
 
-## C source names
 C_FILES = ckinit.c
 
-## Assembly source names
 S_FILES = clock.S
 
 H_FILES = clock.h
-noinst_HEADERS = $(H_FILES)
 
-clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) $(S_FILES:%.S=${ARCH}/%.o)
+clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -27,8 +24,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(clock_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(S_FILES) $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = ckinit.c clock.S clock.h
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips/timer/Makefile.am b/c/src/lib/libcpu/mips/timer/Makefile.am
index 99e55df71d..ee37d10453 100644
--- a/c/src/lib/libcpu/mips/timer/Makefile.am
+++ b/c/src/lib/libcpu/mips/timer/Makefile.am
@@ -4,15 +4,13 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/timer.rel
+PGM = $(ARCH)/timer.rel
 
-## C source names
 C_FILES = timer.c
 
-## Assembly source names
 S_FILES = gettime.S
 
-timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) $(S_FILES:%.S=${ARCH}/%.o)
+timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -24,8 +22,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(S_FILES) $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = gettime.S timer.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips64orion/clock/Makefile.am b/c/src/lib/libcpu/mips64orion/clock/Makefile.am
index 854a2eb08c..e235a5d4de 100644
--- a/c/src/lib/libcpu/mips64orion/clock/Makefile.am
+++ b/c/src/lib/libcpu/mips64orion/clock/Makefile.am
@@ -4,18 +4,15 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/clock.rel
+PGM = $(ARCH)/clock.rel
 
-## C source names
 C_FILES = ckinit.c
 
-## Assembly source names
 S_FILES = clock.S
 
 H_FILES = clock.h
-noinst_HEADERS = $(H_FILES)
 
-clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) $(S_FILES:%.S=${ARCH}/%.o)
+clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -27,8 +24,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(clock_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(S_FILES) $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = ckinit.c clock.S clock.h
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/mips64orion/timer/Makefile.am b/c/src/lib/libcpu/mips64orion/timer/Makefile.am
index 99e55df71d..ee37d10453 100644
--- a/c/src/lib/libcpu/mips64orion/timer/Makefile.am
+++ b/c/src/lib/libcpu/mips64orion/timer/Makefile.am
@@ -4,15 +4,13 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/timer.rel
+PGM = $(ARCH)/timer.rel
 
-## C source names
 C_FILES = timer.c
 
-## Assembly source names
 S_FILES = gettime.S
 
-timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) $(S_FILES:%.S=${ARCH}/%.o)
+timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -24,8 +22,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(S_FILES) $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = gettime.S timer.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am
index 39f0c9f3b6..a8bfed1b4a 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/timer.rel
+PGM = $(ARCH)/timer.rel
 
-## C sources
 C_FILES = timer.c
 
-timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -23,8 +22,10 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = timer.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
index 2a775bc037..fb711f3414 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
@@ -4,13 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-## C sources
 C_FILES = c_clock.c
 
 H_FILES = c_clock.h
-noinst_HEADERS = $(H_FILES)
 
-c_clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+c_clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -20,17 +18,17 @@ $(PROJECT_INCLUDE)/libcpu:
 $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
-$(PROJECT_INCLUDE)/libcpu/c_clock.h
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
 AM_CFLAGS = $(CFLAGS_OS_V)
 
-all-local: ${ARCH} $(PREINSTALL_FILES) $(c_clock_rel_OBJECTS)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
+    $(PROJECT_INCLUDE)/libcpu/c_clock.h
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(c_clock_rel_OBJECTS)
 
-EXTRA_DIST = $(C_FILES)
+EXTRA_DIST = c_clock.c c_clock.h
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
index 0bb6ba34be..e1aca735af 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
@@ -4,18 +4,16 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/exceptions.rel
+PGM = $(ARCH)/exceptions.rel
 
-## C sources
 C_FILES = raw_exception.c
 
-## Assembly sources
 S_FILES = asm_utils.S
 
 H_FILES = raw_exception.h
-noinst_HEADERS = $(H_FILES)
 
-exceptions_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) $(S_FILES:%.S=${ARCH}/%.o)
+exceptions_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) \
+    $(S_FILES:%.S=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -25,9 +23,6 @@ $(PROJECT_INCLUDE)/libcpu:
 $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
-$(PROJECT_INCLUDE)/libcpu/raw_exception.h
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
@@ -37,8 +32,13 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(exceptions_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PREINSTALL_FILES) $(PGM)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
+    $(PROJECT_INCLUDE)/libcpu/raw_exception.h
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(exceptions_rel_OBJECTS) $(PGM)
+
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = asm_utils.S raw_exception.c raw_exception.h
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
index 041881a756..0c3ee63743 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
@@ -4,18 +4,15 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/mmu.rel
+PGM = $(ARCH)/mmu.rel
 
-## C sources
 C_FILES = bat.c
 
-## Assembly sources
 S_FILES = mmuAsm.S
 
 H_FILES = bat.h
-noinst_HEADERS = $(H_FILES)
 
-mmu_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) $(S_FILES:%.S=${ARCH}/%.o)
+mmu_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) $(S_FILES:%.S=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -25,8 +22,6 @@ $(PROJECT_INCLUDE)/libcpu:
 $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu $(PROJECT_INCLUDE)/libcpu/bat.h
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
@@ -36,8 +31,13 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(mmu_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PREINSTALL_FILES) $(PGM)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
+    $(PROJECT_INCLUDE)/libcpu/bat.h
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(mmu_rel_OBJECTS) $(PGM)
+
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = bat.c bat.h mmuAsm.S
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am
index 39f0c9f3b6..a8bfed1b4a 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/timer.rel
+PGM = $(ARCH)/timer.rel
 
-## C sources
 C_FILES = timer.c
 
-timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -23,8 +22,10 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = timer.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.am
index ff64e6e6e2..2ed74ad76f 100644
--- a/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/clock.rel
+PGM = $(ARCH)/clock.rel
 
-## C sources
 C_FILES = clock.c
 
-clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -23,8 +22,10 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(clock_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = clock.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.am
index 4907257c76..279386ae5e 100644
--- a/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/console-generic.rel
+PGM = $(ARCH)/console-generic.rel
 
-## C sources
 C_FILES = console-generic.c
 
-console_generic_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+console_generic_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -23,8 +22,10 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(console_generic_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(console_generic_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = console-generic.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.am
index 39f0c9f3b6..a8bfed1b4a 100644
--- a/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/timer.rel
+PGM = $(ARCH)/timer.rel
 
-## C sources
 C_FILES = timer.c
 
-timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -23,8 +22,10 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = timer.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am
index ff64e6e6e2..2ed74ad76f 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/clock.rel
+PGM = $(ARCH)/clock.rel
 
-## C sources
 C_FILES = clock.c
 
-clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -23,8 +22,10 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(clock_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = clock.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.am
index 4907257c76..279386ae5e 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/console-generic.rel
+PGM = $(ARCH)/console-generic.rel
 
-## C sources
 C_FILES = console-generic.c
 
-console_generic_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+console_generic_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -23,8 +22,10 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(console_generic_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(console_generic_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = console-generic.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am
index 39f0c9f3b6..a8bfed1b4a 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/timer.rel
+PGM = $(ARCH)/timer.rel
 
-## C sources
 C_FILES = timer.c
 
-timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -23,8 +22,10 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = timer.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am b/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am
index f7299a4103..c3195b159d 100644
--- a/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am
@@ -4,7 +4,6 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-# C source names, if any, go here -- minus the .c
 C_FILES = cpu.c
 C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
 
@@ -12,7 +11,6 @@ ROOT_H_FILES =
 RTEMS_SCORE_H_FILES = cpu.h c_isr.inl
 noinst_HEADERS =  $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES)
 
-# Assembly source names, if any, go here -- minus the .S
 S_FILES = cpu_asm.S
 S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
 
diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am
index ff64e6e6e2..2ed74ad76f 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/clock.rel
+PGM = $(ARCH)/clock.rel
 
-## C sources
 C_FILES = clock.c
 
-clock_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+clock_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -23,8 +22,10 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(clock_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = clock.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am
index 43d2fa0a39..0dede804bf 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/console.rel
+PGM = $(ARCH)/console.rel
 
-## C sources
 C_FILES = console.c
 
-console_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -23,8 +22,10 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(console_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(console_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES) console.c.polled
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = console.c console.c.polled
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
index 9cb70cad91..7aa2278352 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
@@ -4,15 +4,13 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/ictrl.rel
+PGM = $(ARCH)/ictrl.rel
 
-## C sources
 C_FILES = ictrl.c
 
 H_FILES = ictrl.h
-noinst_HEADERS = $(H_FILES)
 
-ictrl_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+ictrl_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -22,8 +20,6 @@ $(PROJECT_INCLUDE):
 $(PROJECT_INCLUDE)/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/ictrl.h
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
@@ -33,8 +29,12 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(ictrl_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM) $(TMPINSTALL_FILES)
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/ictrl.h
+
+all-local: $(ARCH) $(ictrl_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+EXTRA_DIST = ictrl.c ictrl.h
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am
index 39f0c9f3b6..a8bfed1b4a 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am
@@ -4,12 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/timer.rel
+PGM = $(ARCH)/timer.rel
 
-## C sources
 C_FILES = timer.c
 
-timer_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o)
+timer_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -23,8 +22,10 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
-EXTRA_DIST = $(C_FILES)
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = timer.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/powerpc/shared/Makefile.am b/c/src/lib/libcpu/powerpc/shared/Makefile.am
index 1bc5f644ac..bc2d1d1ace 100644
--- a/c/src/lib/libcpu/powerpc/shared/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/shared/Makefile.am
@@ -4,43 +4,38 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-## C source names
 C_FILES = cpuIdent.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 H_FILES = cpu.h spr.h io.h mmu.h page.h byteorder.h pgtable.h
-noinst_HEADERS = $(H_FILES)
 
-## Assembly source names
-S_FILES =
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-OBJS = $(C_O_FILES) $(S_O_FILES)
+OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
 
-LIB = ${ARCH}/libcpuspec.a
+LIB = $(ARCH)/libcpuspec.a
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-$(LIB): ${OBJS}
+$(LIB): $(OBJS)
 	$(make-library)
 
-PREINSTALL_FILES += \
-$(PROJECT_INCLUDE)/libcpu \
-$(H_FILES:%=$(PROJECT_INCLUDE)/libcpu/%)
-
 $(PROJECT_INCLUDE)/libcpu:
 	$(mkinstalldirs) $@
 
 $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-all-local: ${ARCH} $(PREINSTALL_FILES) $(LIB)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/libcpu/%)
+
+all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+
+.PRECIOUS: $(LIB)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = byteorder.h cpu.h cpuIdent.c io.h mmu.h page.h pgtable.h spr.h
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7032/clock/Makefile.am b/c/src/lib/libcpu/sh/sh7032/clock/Makefile.am
index 41e531d96f..0f3042d757 100644
--- a/c/src/lib/libcpu/sh/sh7032/clock/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7032/clock/Makefile.am
@@ -4,22 +4,15 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/clock.rel
+PGM = $(ARCH)/clock.rel
 
-## C source names
 C_FILES = ckinit.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-H_FILES =
-
-## Assembly source names
-S_FILES =
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-OBJS = $(C_O_FILES) $(S_O_FILES)
+OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -27,11 +20,13 @@ include $(RTEMS_ROOT)/make/leaf.cfg
 
 AM_CFLAGS += $(CFLAGS_OS_V)
 
-${PGM}: ${OBJS}
-	${make-rel}
+$(PGM): $(OBJS)
+	$(make-rel)
+
+all-local: $(ARCH) $(OBJS) $(PGM)
 
-all: ${ARCH} $(PGM)
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = ckinit.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am b/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am
index 9286cf8249..5637116300 100644
--- a/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am
@@ -4,32 +4,27 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/delay.rel
+PGM = $(ARCH)/delay.rel
 
-## C source names
 C_FILES = delay.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-
-H_FILES =
-
-## Assembly source names
-S_FILES =
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-${PGM}: ${OBJS}
+$(PGM): $(OBJS)
 	$(make-rel)
 
-all: ${ARCH} $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
+
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = delay.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7032/include/Makefile.am b/c/src/lib/libcpu/sh/sh7032/include/Makefile.am
index feb0333fda..72e931ea32 100644
--- a/c/src/lib/libcpu/sh/sh7032/include/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7032/include/Makefile.am
@@ -5,20 +5,21 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
 H_FILES = null.h sci.h sh7_pfc.h sh7_sci.h
-noinst_HEADERS = $(H_FILES)
 
 # NOTE: Unlike other CPUS, we install into a subdirectory to avoid 
 #       file name conflicts
 
-TMPINSTALL_FILES = $(PROJECT_INCLUDE)/sh \
-    $(H_FILES:%=$(PROJECT_INCLUDE)/sh/%)
-
 $(PROJECT_INCLUDE)/sh:
 	$(mkinstalldirs) $@
 
 $(PROJECT_INCLUDE)/sh/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
+TMPINSTALL_FILES += $(PROJECT_INCLUDE)/sh \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/sh/%)
+
 all-local: $(TMPINSTALL_FILES)
 
+EXTRA_DIST = null.h sci.h sh7_pfc.h sh7_sci.h
+
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7032/null/Makefile.am b/c/src/lib/libcpu/sh/sh7032/null/Makefile.am
index dcfa2abdd7..67862acb20 100644
--- a/c/src/lib/libcpu/sh/sh7032/null/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7032/null/Makefile.am
@@ -4,32 +4,27 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/null.rel
+PGM = $(ARCH)/null.rel
 
-## C source names
 C_FILES = open.c close.c read.c write.c init.c cntrl.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-
-H_FILES =
-
-## Assembly source names
-S_FILES =
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-${PGM}: ${OBJS}
+$(PGM): $(OBJS)
 	$(make-rel)
 
-all: ${ARCH} $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
+
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = close.c cntrl.c init.c open.c read.c write.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am b/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am
index de6da49dae..d28034d8a8 100644
--- a/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am
@@ -4,32 +4,27 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/sci.rel
+PGM = $(ARCH)/sci.rel
 
-## C source names
 C_FILES = sci.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-H_FILES =
-
-## Assembly source names
-S_FILES =
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-OBJS = $(C_O_FILES) $(S_O_FILES)
+OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-${PGM}: ${OBJS}
+$(PGM): $(OBJS)
 	$(make-rel)
 
-all: ${ARCH} $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
+
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = sci.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am b/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am
index 1b91bb066c..b72f9ca03b 100644
--- a/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am
@@ -3,32 +3,28 @@
 ## 
 
 AUTOMAKE_OPTIONS = foreign 1.4
-PGM = ${ARCH}/timer.rel
 
-## C source names
-C_FILES = timer.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-
-H_FILES =
+PGM = $(ARCH)/timer.rel
 
-## Assembly source names
-S_FILES =
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+C_FILES = timer.c
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-OBJS = $(C_O_FILES) $(S_O_FILES)
+OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-${PGM}: ${OBJS}
+$(PGM): $(OBJS)
 	$(make-rel)
 
-all: ${ARCH} $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
+
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = timer.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am b/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am
index dee724ecda..0f3042d757 100644
--- a/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am
@@ -4,22 +4,15 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/clock.rel
+PGM = $(ARCH)/clock.rel
 
-## C source names
 C_FILES = ckinit.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-H_FILES =
-
-## Assembly source names
-S_FILES =
-S_O_FILES = $(S_FILES:%.s=${ARCH}/%.o)
-
-OBJS = $(C_O_FILES) $(S_O_FILES)
+OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
@@ -27,11 +20,13 @@ include $(RTEMS_ROOT)/make/leaf.cfg
 
 AM_CFLAGS += $(CFLAGS_OS_V)
 
-${PGM}: ${OBJS}
-	${make-rel}
+$(PGM): $(OBJS)
+	$(make-rel)
+
+all-local: $(ARCH) $(OBJS) $(PGM)
 
-all: ${ARCH} $(PGM)
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = ckinit.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7045/include/Makefile.am b/c/src/lib/libcpu/sh/sh7045/include/Makefile.am
index 10a2f74720..7fb244b465 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7045/include/Makefile.am
@@ -9,16 +9,17 @@ H_FILES = io_types.h null.h sci.h sh7_pfc.h sh7_sci.h
 # NOTE: Unlike other CPUS, we install into a subdirectory to avoid 
 #       file name conflicts
 
-TMPINSTALL_FILES = \
-$(PROJECT_INCLUDE)/sh \
-$(H_FILES:%=$(PROJECT_INCLUDE)/sh/%)
-
 $(PROJECT_INCLUDE)/sh:
 	$(mkinstalldirs) $@
 
 $(PROJECT_INCLUDE)/sh/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
+TMPINSTALL_FILES += $(PROJECT_INCLUDE)/sh \
+    $(H_FILES:%=$(PROJECT_INCLUDE)/sh/%)
+
 all-local: $(TMPINSTALL_FILES)
 
+EXTRA_DIST = io_types.h null.h sci.h sh7_pfc.h sh7_sci.h
+
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7045/null/Makefile.am b/c/src/lib/libcpu/sh/sh7045/null/Makefile.am
index dcfa2abdd7..67862acb20 100644
--- a/c/src/lib/libcpu/sh/sh7045/null/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7045/null/Makefile.am
@@ -4,32 +4,27 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/null.rel
+PGM = $(ARCH)/null.rel
 
-## C source names
 C_FILES = open.c close.c read.c write.c init.c cntrl.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
-
-H_FILES =
-
-## Assembly source names
-S_FILES =
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
 OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-${PGM}: ${OBJS}
+$(PGM): $(OBJS)
 	$(make-rel)
 
-all: ${ARCH} $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
+
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = close.c cntrl.c init.c open.c read.c write.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am b/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am
index de6da49dae..d28034d8a8 100644
--- a/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am
@@ -4,32 +4,27 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/sci.rel
+PGM = $(ARCH)/sci.rel
 
-## C source names
 C_FILES = sci.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-H_FILES =
-
-## Assembly source names
-S_FILES =
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-OBJS = $(C_O_FILES) $(S_O_FILES)
+OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-${PGM}: ${OBJS}
+$(PGM): $(OBJS)
 	$(make-rel)
 
-all: ${ARCH} $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
+
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = sci.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am b/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am
index 71fffd6b3e..b72f9ca03b 100644
--- a/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am
@@ -4,32 +4,27 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/timer.rel
+PGM = $(ARCH)/timer.rel
 
-## C source names
 C_FILES = timer.c
-C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 
-H_FILES =
-
-## Assembly source names
-S_FILES =
-S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
-
-OBJS = $(C_O_FILES) $(S_O_FILES)
+OBJS = $(C_O_FILES)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
+include $(top_srcdir)/../../../../../automake/lib.am
 
 #
 # (OPTIONAL) Add local stuff here using +=
 #
 
-${PGM}: ${OBJS}
+$(PGM): $(OBJS)
 	$(make-rel)
 
-all: ${ARCH} $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
+
+.PRECIOUS: $(PGM)
 
-EXTRA_DIST = $(C_FILES) $(S_FILES)
+EXTRA_DIST = timer.c
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sparc/reg_win/Makefile.am b/c/src/lib/libcpu/sparc/reg_win/Makefile.am
index b41bfba876..91a8f1feb1 100644
--- a/c/src/lib/libcpu/sparc/reg_win/Makefile.am
+++ b/c/src/lib/libcpu/sparc/reg_win/Makefile.am
@@ -4,10 +4,10 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/reg_win.rel
+PGM = $(ARCH)/reg_win.rel
 
 S_FILES = window.S
-reg_win_rel_OBJECTS = $(S_FILES:%.S=${ARCH}/%.o)
+reg_win_rel_OBJECTS = $(S_FILES:%.S=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -21,11 +21,13 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(reg_win_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
-
 # the .rel file built here will be put into libbsp.a by
 #    libbsp/sparc/BSP/wrapup/Makefile
 
-EXTRA_DIST = $(S_FILES)
+all-local: $(ARCH) $(reg_win_rel_OBJECTS) $(PGM)
+
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = window.S
 
 include $(top_srcdir)/../../../../../automake/local.am
diff --git a/c/src/lib/libcpu/sparc/syscall/Makefile.am b/c/src/lib/libcpu/sparc/syscall/Makefile.am
index 1466361945..e0246b2829 100644
--- a/c/src/lib/libcpu/sparc/syscall/Makefile.am
+++ b/c/src/lib/libcpu/sparc/syscall/Makefile.am
@@ -4,15 +4,14 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
-PGM = ${ARCH}/syscall.rel
+PGM = $(ARCH)/syscall.rel
 
 ## Assembly sources
 S_FILES = syscall.S
 
 H_FILES = syscall.h
-noinst_HEADERS = $(H_FILES)
 
-syscall_rel_OBJECTS = $(S_FILES:%.S=${ARCH}/%.o)
+syscall_rel_OBJECTS = $(S_FILES:%.S=$(ARCH)/%.o)
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
 include $(top_srcdir)/../../../../../automake/lib.am
@@ -26,11 +25,13 @@ AM_CFLAGS = $(CFLAGS_OS_V)
 $(PGM): $(syscall_rel_OBJECTS)
 	$(make-rel)
 
-all-local: ${ARCH} $(PGM)
-
-EXTRA_DIST = $(S_FILES)
-
 # the .rel file built here will be put into libbsp.a by
 #    libbsp/sparc/BSP/wrapup/Makefile
 
+all-local: $(ARCH) $(syscall_rel_OBJECTS) $(PGM)
+
+.PRECIOUS: $(PGM)
+
+EXTRA_DIST = syscall.S syscall.h
+
 include $(top_srcdir)/../../../../../automake/local.am