From 4e36a2f133c68aaf637e166385eff1a05b59f38e Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 31 Jan 2000 15:27:02 +0000
Subject: 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
---
 c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am  | 11 +++++----
 c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am  | 14 +++++------
 .../libcpu/powerpc/mpc6xx/exceptions/Makefile.am   | 20 ++++++++--------
 c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am    | 18 +++++++--------
 c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am  | 11 +++++----
 c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.am  | 11 +++++----
 .../powerpc/mpc821/console-generic/Makefile.am     | 11 +++++----
 c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.am  | 11 +++++----
 c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am  | 11 +++++----
 .../powerpc/mpc860/console-generic/Makefile.am     | 11 +++++----
 c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am  | 11 +++++----
 .../powerpc/new_exception_processing/Makefile.am   |  2 --
 c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am  | 11 +++++----
 .../lib/libcpu/powerpc/ppc403/console/Makefile.am  | 11 +++++----
 c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am  | 16 ++++++-------
 c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am  | 11 +++++----
 c/src/lib/libcpu/powerpc/shared/Makefile.am        | 27 +++++++++-------------
 17 files changed, 110 insertions(+), 108 deletions(-)

(limited to 'c/src/lib/libcpu/powerpc')

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
-- 
cgit v1.2.3