Patch rtems-rc-4.5.0-6-cvs.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>.

The patch contains:

  * build variants support
  * Reworked make-exe custom/*.cfg for all targets (Should be
    self-explanatory, may still be incomplete)
  * Several fixes to custom/*.cfgs related to setting debug flags
  * Fixes to some bsp_specs for BSPs which apparently have never been
    build with debugging before ;)
  * pc386.cfg fix attempts (cf. my mail from earlier today)
  * Updated ampolish (No need to run it, the patch contains the result
    from having applied it)

Known bugs/deficiencies related to this work:

  * "make [clean|distclean]" support is still incomplete (e.g. "make
    clean" does not delete all Depends-o-*)
  * Completely untested for linux/posix and hppa.
  * Build failures of i960 BSPs (make VARIANT=DEBUG) - I guess, they are
    not related to this patch.
  * Successfully tested for all sh, sparc, i386, ppc, m68k BSPs (make
    VARIANT=DEBUG)
  * make VARIANT=PROFILE not supported by all BSPs (I don't care :)
  * make VARIANT=DEBUG failures below tests/ for some BSPs (e.g. gensh1),
    because of the tests's binaries being too large to fit into the target
    memory layout.

48 files changed, 48 insertions, 96 deletions

diff --git a/c/src/lib/libcpu/a29k/clock/Makefile.am b/c/src/lib/libcpu/a29k/clock/Makefile.am
index 6256fa554b..755c132239 100644
--- a/c/src/lib/libcpu/a29k/clock/Makefile.am
+++ b/c/src/lib/libcpu/a29k/clock/Makefile.am
@@ -26,7 +26,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(OBJS)
 	$(make-rel)
 
-all: $(ARCH) $(OBJS) $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/a29k/timer/Makefile.am b/c/src/lib/libcpu/a29k/timer/Makefile.am
index f67315c8ca..a468af3fbe 100644
--- a/c/src/lib/libcpu/a29k/timer/Makefile.am
+++ b/c/src/lib/libcpu/a29k/timer/Makefile.am
@@ -23,7 +23,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(OBJS)
 	$(make-rel)
 
-all: $(ARCH) $(OBJS) $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/hppa1.1/clock/Makefile.am b/c/src/lib/libcpu/hppa1.1/clock/Makefile.am
index 35f3aa7bd9..f8b46ecc12 100644
--- a/c/src/lib/libcpu/hppa1.1/clock/Makefile.am
+++ b/c/src/lib/libcpu/hppa1.1/clock/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(clock_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/hppa1.1/include/Makefile.am b/c/src/lib/libcpu/hppa1.1/include/Makefile.am
index bfdb862cb1..8adb914568 100644
--- a/c/src/lib/libcpu/hppa1.1/include/Makefile.am
+++ b/c/src/lib/libcpu/hppa1.1/include/Makefile.am
@@ -18,7 +18,7 @@ $(PROJECT_INCLUDE)/hppa1.1/%.h: %.h
 TMPINSTALL_FILES += $(PROJECT_INCLUDE)/hppa1.1 \
     $(H_FILES:%.h=$(PROJECT_INCLUDE)/hppa1.1/%.h)
 
-all: $(TMPINSTALL_FILES)
+all-local: $(TMPINSTALL_FILES)
 
 EXTRA_DIST = runway.h semaphore.h
 
diff --git a/c/src/lib/libcpu/hppa1.1/milli/Makefile.am b/c/src/lib/libcpu/hppa1.1/milli/Makefile.am
index 10b9b633a6..41744e4ef2 100644
--- a/c/src/lib/libcpu/hppa1.1/milli/Makefile.am
+++ b/c/src/lib/libcpu/hppa1.1/milli/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(milli_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(milli_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(milli_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am b/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am
index 22a5281362..c0af1ec990 100644
--- a/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am
+++ b/c/src/lib/libcpu/hppa1.1/semaphore/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(semaphore_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(semaphore_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(semaphore_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/hppa1.1/timer/Makefile.am b/c/src/lib/libcpu/hppa1.1/timer/Makefile.am
index 8b2458a147..65edc98d9f 100644
--- a/c/src/lib/libcpu/hppa1.1/timer/Makefile.am
+++ b/c/src/lib/libcpu/hppa1.1/timer/Makefile.am
@@ -20,7 +20,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/i386/Makefile.am b/c/src/lib/libcpu/i386/Makefile.am
index 9eaa686094..90e2d0bc8b 100644
--- a/c/src/lib/libcpu/i386/Makefile.am
+++ b/c/src/lib/libcpu/i386/Makefile.am
@@ -38,7 +38,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
 
-all: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) $(TMPINSTALL_FILES)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB) $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(LIB)
 
diff --git a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am b/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am
index a82385b4e5..c4ffe3f26d 100644
--- a/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am
+++ b/c/src/lib/libcpu/m68k/m68040/fpsp/Makefile.am
@@ -28,13 +28,11 @@ OBJS = $(C_O_FILES) $(S_O_FILES)
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS += $(CFLAGS_OS_V)
-
 $(PGM): $(OBJS)
 	$(make-rel)
 
 if m68040
-all: $(ARCH) $(OBJS) $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
 endif
 
 .PRECIOUS: $(PGM)
diff --git a/c/src/lib/libcpu/mips64orion/clock/Makefile.am b/c/src/lib/libcpu/mips64orion/clock/Makefile.am
index ac3d77d6e8..6384df0a0a 100644
--- a/c/src/lib/libcpu/mips64orion/clock/Makefile.am
+++ b/c/src/lib/libcpu/mips64orion/clock/Makefile.am
@@ -24,7 +24,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(clock_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/mips64orion/timer/Makefile.am b/c/src/lib/libcpu/mips64orion/timer/Makefile.am
index 1d3ef4503f..d0c0ee598f 100644
--- a/c/src/lib/libcpu/mips64orion/timer/Makefile.am
+++ b/c/src/lib/libcpu/mips64orion/timer/Makefile.am
@@ -22,7 +22,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am
index 8158ad03b2..65edc98d9f 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc505/timer/Makefile.am
@@ -17,12 +17,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am
index eef1cc7e3c..0f5a304686 100644
--- a/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc505/vectors/Makefile.am
@@ -22,12 +22,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(vectors_rel_OBJECTS)
 	$(make-rel)
 
-all: ${ARCH} $(PGM)
+all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = vectors.S
 
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
index 590984d4df..7ac55df4a7 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/clock/Makefile.am
@@ -22,12 +22,10 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
     $(PROJECT_INCLUDE)/libcpu/c_clock.h
 
-all: $(ARCH) $(PREINSTALL_FILES) $(c_clock_rel_OBJECTS)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(c_clock_rel_OBJECTS)
 
 EXTRA_DIST = c_clock.c c_clock.h
 
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
index 62cb2a832c..ea6b94b5b5 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/exceptions/Makefile.am
@@ -27,15 +27,13 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(exceptions_rel_OBJECTS)
 	$(make-rel)
 
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
     $(PROJECT_INCLUDE)/libcpu/raw_exception.h
 
-all: $(ARCH) $(PREINSTALL_FILES) $(exceptions_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(exceptions_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
index 5927bf19a8..c64da3def0 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/mmu/Makefile.am
@@ -26,15 +26,13 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(mmu_rel_OBJECTS)
 	$(make-rel)
 
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
     $(PROJECT_INCLUDE)/libcpu/bat.h
 
-all: $(ARCH) $(PREINSTALL_FILES) $(mmu_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(mmu_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am
index 8158ad03b2..65edc98d9f 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/timer/Makefile.am
@@ -17,12 +17,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am b/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am
index 4350f154fa..36950229a9 100644
--- a/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc6xx/wrapup/Makefile.am
@@ -26,6 +26,6 @@ $(LIB): ${OBJS}
 	$(make-library)
 	cp $(LIB) ..
 
-all: ${ARCH} $(LIB)
+all-local: ${ARCH} $(LIB)
 
 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 8a89adbb28..f8b46ecc12 100644
--- a/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc821/clock/Makefile.am
@@ -17,12 +17,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(clock_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
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 223db1f126..b0c900fc7c 100644
--- a/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc821/console-generic/Makefile.am
@@ -17,12 +17,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(console_generic_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(console_generic_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(console_generic_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/powerpc/mpc821/include/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/include/Makefile.am
index 9325e13c02..8a4dfbd74d 100644
--- a/c/src/lib/libcpu/powerpc/mpc821/include/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc821/include/Makefile.am
@@ -16,6 +16,6 @@ $(PROJECT_INCLUDE)/mpc821:
 $(PROJECT_INCLUDE)/mpc821/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-all: $(TMPINSTALL_FILES)
+all-local: $(TMPINSTALL_FILES)
 
 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 8158ad03b2..65edc98d9f 100644
--- a/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc821/timer/Makefile.am
@@ -17,12 +17,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.am
index bf04ee809d..8d8bce2c1d 100644
--- a/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc821/vectors/Makefile.am
@@ -22,12 +22,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(vectors_rel_OBJECTS)
 	$(make-rel)
 
-all: ${ARCH} $(PGM)
+all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = vectors.S README
 
diff --git a/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am
index 8a89adbb28..f8b46ecc12 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc860/clock/Makefile.am
@@ -17,12 +17,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(clock_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
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 223db1f126..b0c900fc7c 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc860/console-generic/Makefile.am
@@ -17,12 +17,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(console_generic_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(console_generic_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(console_generic_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.am
index 0ac77f1fe8..ebbb1a1e51 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc860/include/Makefile.am
@@ -22,6 +22,6 @@ $(PROJECT_INCLUDE)/%.h: %.h
 $(PROJECT_INCLUDE)/mpc860/%.h: %.h
 	$(INSTALL_DATA) $< $@
 
-all: $(PREINSTALL_FILES)
+all-local: $(PREINSTALL_FILES)
 
 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 8158ad03b2..65edc98d9f 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc860/timer/Makefile.am
@@ -17,12 +17,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.am
index bf04ee809d..8d8bce2c1d 100644
--- a/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/mpc860/vectors/Makefile.am
@@ -22,12 +22,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(vectors_rel_OBJECTS)
 	$(make-rel)
 
-all: ${ARCH} $(PGM)
+all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = vectors.S README
 
diff --git a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am
index 8a89adbb28..f8b46ecc12 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/clock/Makefile.am
@@ -17,12 +17,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(clock_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(clock_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am
index 73ea97047c..4289321d14 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/console/Makefile.am
@@ -17,12 +17,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(console_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(console_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(console_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
index e243f1196f..efefed93e9 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/ictrl/Makefile.am
@@ -24,14 +24,12 @@ $(PROJECT_INCLUDE)/%.h: %.h
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(ictrl_rel_OBJECTS)
 	$(make-rel)
 
 TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/ictrl.h
 
-all: $(ARCH) $(ictrl_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)
+all-local: $(ARCH) $(ictrl_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am
index 8158ad03b2..65edc98d9f 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/timer/Makefile.am
@@ -17,12 +17,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(timer_rel_OBJECTS)
 	$(make-rel)
 
-all: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(timer_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am
index 2b35c62cd5..ce95f92721 100644
--- a/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/ppc403/vectors/Makefile.am
@@ -18,12 +18,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(vectors_rel_OBJECTS)
 	$(make-rel)
 
-all: ${ARCH} $(PGM)
+all-local: ${ARCH} $(PGM)
 
 EXTRA_DIST = $(S_FILES) README
 
diff --git a/c/src/lib/libcpu/powerpc/shared/Makefile.am b/c/src/lib/libcpu/powerpc/shared/Makefile.am
index 0e7c764d18..edbb18ae0c 100644
--- a/c/src/lib/libcpu/powerpc/shared/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/shared/Makefile.am
@@ -32,7 +32,7 @@ $(PROJECT_INCLUDE)/libcpu/%.h: %.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
     $(H_FILES:%=$(PROJECT_INCLUDE)/libcpu/%)
 
-all: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
 
 .PRECIOUS: $(LIB)
 
diff --git a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am b/c/src/lib/libcpu/powerpc/wrapup/Makefile.am
index e0b03be1d3..48af0f6dcb 100644
--- a/c/src/lib/libcpu/powerpc/wrapup/Makefile.am
+++ b/c/src/lib/libcpu/powerpc/wrapup/Makefile.am
@@ -31,6 +31,6 @@ $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a: $(LIB)
 
 TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/libcpu$(LIB_VARIANT).a
 
-all: ${ARCH} $(LIB) $(TMPINSTALL_FILES)
+all-local: ${ARCH} $(LIB) $(TMPINSTALL_FILES)
 
 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 9a387ee926..10ae91df8f 100644
--- a/c/src/lib/libcpu/sh/sh7032/clock/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7032/clock/Makefile.am
@@ -18,12 +18,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS += $(CFLAGS_OS_V)
-
 $(PGM): $(OBJS)
 	$(make-rel)
 
-all: $(ARCH) $(OBJS) $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am b/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am
index 1962ece592..44ff144b86 100644
--- a/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am
@@ -21,7 +21,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(OBJS)
 	$(make-rel)
 
-all: $(ARCH) $(OBJS) $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/sh/sh7032/include/Makefile.am b/c/src/lib/libcpu/sh/sh7032/include/Makefile.am
index 4a169232a5..7d26513f10 100644
--- a/c/src/lib/libcpu/sh/sh7032/include/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7032/include/Makefile.am
@@ -18,7 +18,7 @@ $(PROJECT_INCLUDE)/sh/%.h: %.h
 TMPINSTALL_FILES += $(PROJECT_INCLUDE)/sh \
     $(H_FILES:%=$(PROJECT_INCLUDE)/sh/%)
 
-all: $(TMPINSTALL_FILES)
+all-local: $(TMPINSTALL_FILES)
 
 EXTRA_DIST = null.h sci.h sh7_pfc.h sh7_sci.h
 
diff --git a/c/src/lib/libcpu/sh/sh7032/null/Makefile.am b/c/src/lib/libcpu/sh/sh7032/null/Makefile.am
index c0c7369387..2e6baea4a3 100644
--- a/c/src/lib/libcpu/sh/sh7032/null/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7032/null/Makefile.am
@@ -21,7 +21,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(OBJS)
 	$(make-rel)
 
-all: $(ARCH) $(OBJS) $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am b/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am
index 840f2e8567..aef7e13b3b 100644
--- a/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am
@@ -21,7 +21,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(OBJS)
 	$(make-rel)
 
-all: $(ARCH) $(OBJS) $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am b/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am
index 41dacf22cb..5a164c0d4c 100644
--- a/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am
@@ -21,7 +21,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(OBJS)
 	$(make-rel)
 
-all: $(ARCH) $(OBJS) $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am b/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am
index 9a387ee926..10ae91df8f 100644
--- a/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am
@@ -18,12 +18,10 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS += $(CFLAGS_OS_V)
-
 $(PGM): $(OBJS)
 	$(make-rel)
 
-all: $(ARCH) $(OBJS) $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/sh/sh7045/include/Makefile.am b/c/src/lib/libcpu/sh/sh7045/include/Makefile.am
index 1323efd364..8a424d634f 100644
--- a/c/src/lib/libcpu/sh/sh7045/include/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7045/include/Makefile.am
@@ -18,7 +18,7 @@ $(PROJECT_INCLUDE)/sh/%.h: %.h
 TMPINSTALL_FILES += $(PROJECT_INCLUDE)/sh \
     $(H_FILES:%=$(PROJECT_INCLUDE)/sh/%)
 
-all: $(TMPINSTALL_FILES)
+all-local: $(TMPINSTALL_FILES)
 
 EXTRA_DIST = io_types.h null.h sci.h sh7_pfc.h sh7_sci.h
 
diff --git a/c/src/lib/libcpu/sh/sh7045/null/Makefile.am b/c/src/lib/libcpu/sh/sh7045/null/Makefile.am
index c0c7369387..2e6baea4a3 100644
--- a/c/src/lib/libcpu/sh/sh7045/null/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7045/null/Makefile.am
@@ -21,7 +21,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(OBJS)
 	$(make-rel)
 
-all: $(ARCH) $(OBJS) $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am b/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am
index 840f2e8567..aef7e13b3b 100644
--- a/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am
@@ -21,7 +21,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(OBJS)
 	$(make-rel)
 
-all: $(ARCH) $(OBJS) $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am b/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am
index 41dacf22cb..5a164c0d4c 100644
--- a/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am
+++ b/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am
@@ -21,7 +21,7 @@ include $(top_srcdir)/../../../../../automake/lib.am
 $(PGM): $(OBJS)
 	$(make-rel)
 
-all: $(ARCH) $(OBJS) $(PGM)
+all-local: $(ARCH) $(OBJS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/sparc/reg_win/Makefile.am b/c/src/lib/libcpu/sparc/reg_win/Makefile.am
index 79e504d0b6..00e28ec1da 100644
--- a/c/src/lib/libcpu/sparc/reg_win/Makefile.am
+++ b/c/src/lib/libcpu/sparc/reg_win/Makefile.am
@@ -16,15 +16,13 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(reg_win_rel_OBJECTS)
 	$(make-rel)
 
 # the .rel file built here will be put into libbsp.a by
 #    libbsp/sparc/BSP/wrapup/Makefile
 
-all: $(ARCH) $(reg_win_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(reg_win_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)
 
diff --git a/c/src/lib/libcpu/sparc/syscall/Makefile.am b/c/src/lib/libcpu/sparc/syscall/Makefile.am
index c3ca3a1092..7dc41907bf 100644
--- a/c/src/lib/libcpu/sparc/syscall/Makefile.am
+++ b/c/src/lib/libcpu/sparc/syscall/Makefile.am
@@ -20,15 +20,13 @@ include $(top_srcdir)/../../../../../automake/lib.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
-AM_CFLAGS = $(CFLAGS_OS_V)
-
 $(PGM): $(syscall_rel_OBJECTS)
 	$(make-rel)
 
 # the .rel file built here will be put into libbsp.a by
 #    libbsp/sparc/BSP/wrapup/Makefile
 
-all: $(ARCH) $(syscall_rel_OBJECTS) $(PGM)
+all-local: $(ARCH) $(syscall_rel_OBJECTS) $(PGM)
 
 .PRECIOUS: $(PGM)