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.

3 files changed, 40 insertions, 27 deletions

diff --git a/automake/host.am b/automake/host.am
index a9ebea3275..7ace38f793 100644
--- a/automake/host.am
+++ b/automake/host.am
@@ -5,13 +5,19 @@
 ## Once automake is fully integrated these make targets 
 ## and this file will probably be removed
 
-debug-am: all-am
-debug: debug-am
-.PHONY: debug debug-am
+debug:
+	@echo
+	@echo "\"make debug\" is obsolete, instead use:"
+	@echo "	make VARIANT=DEBUG"
+	@echo
 
-profile-am: all-am
-profile: profile-am
-.PHONY: profile profile-am
+.PHONY: debug
+
+profile:
+	@echo
+	@echo "\"make profile\" is obsolete, instead use:"
+	@echo "	make VARIANT=PROFILE"
+	@echo
 
 preinstall-am: $(PREINSTALL_FILES)
 preinstall: preinstall-am
diff --git a/automake/local.am b/automake/local.am
index 4cf0f85a3f..3186db0436 100644
--- a/automake/local.am
+++ b/automake/local.am
@@ -5,21 +5,30 @@
 ## Once automake is fully integrated these make targets 
 ## and this file will probably be removed
 
-debug-am:
-	$(MAKE) $(AM_MAKEFLAGS) "ARCH=o-debug" \
-      "CFLAGS_DEBUG=$(CFLAGS_DEBUG_V)" \
-      "LDFLAGS_DEBUG=$(LDFLAGS_DEBUG_V)" $(TARGET_VA)
+VARIANT = OPTIMIZE
 
-debug: debug-am
-.PHONY: debug debug-am
+VARIANT_OPTIMIZE_V = optimize
+VARIANT_DEBUG_V = debug
+VARIANT_PROFILE_V = profile
 
-profile-am:
-	$(MAKE) $(AM_MAKEFLAGS) "ARCH=o-profile" \
-      "CFLAGS_PROFILE=$(CFLAGS_PROFILE_V)" \
-      "LDFLAGS_PROFILE=$(LDFLAGS_PROFILE_V)" $(TARGET_VA)
+ARCH = o-$(VARIANT_$(VARIANT)_V)
+AM_CFLAGS += $(CFLAGS_$(VARIANT)_V)
 
-profile: profile-am
-.PHONY: profile profile-am
+debug:
+	@echo
+	@echo "\"make debug\" is obsolete, instead use:"
+	@echo "	make VARIANT=DEBUG"
+	@echo
+
+.PHONY: debug
+
+profile:
+	@echo
+	@echo "\"make profile\" is obsolete, instead use:"
+	@echo "	make VARIANT=PROFILE"
+	@echo
+
+.PHONY: profile
 
 preinstall-am: $(PREINSTALL_FILES)
 preinstall: preinstall-am
@@ -28,3 +37,9 @@ preinstall: preinstall-am
 depend-am:
 depend: depend-am
 .PHONY: depend depend-am
+
+${ARCH}:
+	mkdir ${ARCH}
+
+clean:
+	$(RM) -r o-optimize o-debug o-profile
diff --git a/automake/subdirs.am b/automake/subdirs.am
index dfca504623..3d54285dec 100644
--- a/automake/subdirs.am
+++ b/automake/subdirs.am
@@ -8,9 +8,7 @@
 ## and this file will probably be removed
 
 depend-recursive \
-preinstall-recursive \
-debug-recursive \
-profile-recursive:
+preinstall-recursive:
 	@set fnord $(MAKEFLAGS); amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
@@ -31,12 +29,6 @@ profile-recursive:
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-debug: debug-recursive
-.PHONY: debug-recursive
-
-profile: profile-recursive
-.PHONY: profile-recursive
-
 preinstall: preinstall-recursive
 .PHONY: preinstall-recursive