2003-05-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

PR 321:
	* aclocal/env-rtemscpu.m4: Remove support for profile-variant.
	* automake/compile.am: Ditto.
	* automake/local.am: Ditto.

cpukit/ChangeLog

@@ -1,3 +1,10 @@
+2003-05-27	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	PR 321:
+	* aclocal/env-rtemscpu.m4: Remove support for profile-variant.
+	* automake/compile.am: Ditto.
+	* automake/local.am: Ditto.
+
 2003-05-14	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* automake/compile.am: Remove LIBSUFFIX_VA (unused).

cpukit/aclocal/env-rtemscpu.m4

@@ -26,8 +26,6 @@ AC_DEFUN(RTEMS_ENV_RTEMSCPU,
       [CFLAGS for building the optimized variant])
     AC_ARG_VAR([CFLAGS_DEBUG_V],
       [CFLAGS for building the debugging variant])
-    AC_ARG_VAR([CFLAGS_PROFILE_V],
-      [CFLAGS for building the profiled variant])
  
     AC_ARG_VAR([RTEMS_BSP],[RTEMS_BSP to build])
     AC_MSG_CHECKING([for RTEMS_BSP])

cpukit/automake/compile.am

@@ -30,11 +30,11 @@
 ## * The non-gcc building scheme requires manually setting up environment 
 ##   variables and is hardly tested at all
 
-## CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V, CFLAGS_PROFILE_V are the values we
+## CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V are the values we
 ## would want the corresponding macros to be set to.
 ##
-## CFLAGS_OPTIMIZE, CFLAGS_DEBUG, CFLAGS_PROFILE are set by the 
-## 'VARIANT=<OPTIMIZE|DEBUG|PROFILE>' targets to their _V values.
+## CFLAGS_OPTIMIZE, CFLAGS_DEBUG are set by the 
+## 'VARIANT=<OPTIMIZE|DEBUG>' targets to their _V values.
 
 ## XCPPFLAGS, XCFLAGS, XASFLAGS 
 ## are used to add flags from the shell
@@ -84,7 +84,7 @@ depend-gcc: $(C_FILES) $(CC_FILES) $(S_FILES)
 ##       Use gcc -M to generate dependencies
 ##       Replace foo.$(OBJEXT) with $(ARCH)/foo.$(OBJEXT)
 ##       Replace $(ARCH) value with string $(ARCH)
-##           so that it will for debug and profile cases
+##           so that it will for debug cases
 	$(COMPILE) -M   $^    |  \
 	sed -e 's?^\(.*\)\.o[ ]*:?$$(ARCH)/\1.o:?' \
 	    -e 's?$(ARCH)/?$$(ARCH)/?'   >$(DEPEND).tmp
@@ -104,17 +104,14 @@ VARIANT = OPTIMIZE
 
 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)
@@ -125,7 +122,6 @@ ${ARCH}:
 ## 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)
@@ -134,7 +130,6 @@ LIB_VARIANT = $(LIBSUFFIX_$(VARIANT_V)_V)
 CPU_CFLAGS = @CPU_CFLAGS@
 CFLAGS_OPTIMIZE_V = @CFLAGS_OPTIMIZE_V@
 CFLAGS_DEBUG_V = @CFLAGS_DEBUG_V@
-CFLAGS_PROFILE_V = @CFLAGS_PROFILE_V@
 CFLAGS__V = $(CFLAGS_OPTIMIZE_V)
 
 ## ------------------------------------------------------------------------
@@ -143,7 +138,6 @@ if RTEMS_USE_GCC
 ## gcc >= gcc-2.8
 RTEMS_CFLAGS_OPTIMIZE_V =
 RTEMS_CFLAGS_DEBUG_V = -Wno-unused
-RTEMS_CFLAGS_PROFILE_V = -pg
 
 ## non-gcc
 ## We can't guess what flags might be required here.

cpukit/automake/local.am

@@ -8,14 +8,6 @@ debug:
 
 .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
 .PHONY: preinstall preinstall-am
@@ -25,6 +17,6 @@ depend: depend-am
 .PHONY: depend depend-am depend-gcc
 
 clean-local:
-	$(RM) -r o-optimize o-debug o-profile $(CLEANDIRS)
-	$(RM) Depends-o-optimize.tmp Depends-o-debug.tmp Depends-o-profile.tmp
+	$(RM) -r o-optimize o-debug $(CLEANDIRS)
+	$(RM) Depends-o-optimize.tmp Depends-o-debug.tmp