3 files changed, 93 insertions, 15 deletions
diff --git a/automake/host.am b/automake/host.am
new file mode 100644
index 0000000000..7ace38f793
--- /dev/null
+++ b/automake/host.am
@@ -0,0 +1,28 @@
+## $Id$
+
+## NOTE: This is a temporary work-around to keep 
+## RTEMS's non automake standard make targets working.
+## Once automake is fully integrated these make targets 
+## and this file will probably be removed
+
+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
+
+preinstall-am: $(PREINSTALL_FILES)
+preinstall: preinstall-am
+.PHONY: preinstall preinstall-am
+
+depend-am:
+depend: depend-am
+.PHONY: depend depend-am
diff --git a/automake/local.am b/automake/local.am
index a6c43b1779..324a803a37 100644
--- a/automake/local.am
+++ b/automake/local.am
@@ -5,13 +5,59 @@
 ## Once automake is fully integrated these make targets 
 ## and this file will probably be removed
 
-debug-am:
-debug: debug-am
-.PHONY: debug debug-am
+## translate VARIANT into VARIANT_V
+VARIANT = OPTIMIZE
 
-profile-am:
-profile: profile-am
-.PHONY: profile profile-am
+VARIANT_OPTIMIZE_V = OPTIMIZE
+VARIANT_DEBUG_V = DEBUG
+VARIANT_PROFILE_V = PROFILE
+VARIANT_optimize_V = OPTIMIZE
+VARIANT_debug_V = DEBUG
+VARIANT_profile_V = PROFILE
+
+VARIANT_V = $(VARIANT_$(VARIANT)_V)
+
+## Setup the variant build subdirectory
+ARCH_OPTIMIZE_V = o-optimize
+ARCH_DEBUG_V = o-debug
+ARCH_PROFILE_V = o-profile
+
+ARCH__V = $(ARCH_OPTIMIZE_V)
+ARCH = $(ARCH_$(VARIANT_V)_V)
+
+## Setup the library suffix
+LIBSUFFIX_OPTIMIZE_V =
+LIBSUFFIX_DEBUG_V = _g
+LIBSUFFIX_PROFILE_V = _p
+
+LIBSUFFIX__V = $(LIBSUFFIX_OPTIMIZE_V)
+LIB_VARIANT = $(LIBSUFFIX_$(VARIANT_V)_V)
+
+LIBSUFFIX_VA = $(LIB_VARIANT).a
+
+## These are supposed to be set in make/custom/<bsp>.cfg
+## CFLAGS_OPTIMIZE_V = 
+## CFLAGS_DEBUG_V =
+## CFLAGS_PROFILE_V =
+
+CFLAGS__V = $(CFLAGS_OPTIMIZE_V)
+AM_CFLAGS += $(CFLAGS_$(VARIANT_V)_V)
+
+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
@@ -20,3 +66,15 @@ preinstall: preinstall-am
 depend-am:
 depend: depend-am
 .PHONY: depend depend-am
+
+${ARCH}:
+	mkdir ${ARCH}
+
+clean-local:
+	$(RM) -r o-optimize o-debug o-profile $(CLEANDIRS)
+	$(RM) Depends-o-optimize.tmp Depends-o-debug.tmp Depends-o-profile.tmp
+
+distclean-local:
+	$(RM) Depends-o-optimize Depends-o-debug Depends-o-profile
+
+PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools
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