2004-01-06 Ralf Corsepius <ralf.corsepius@rtems.org>

	* automake/compile.am: Remove CONFIG.CC (Unused).
	Remove CPPFLAGS, CFLAGS, CXXFLAGS, ASFLAGS (Implicitly handled by
	automake). Add CCAS. Use AM_*FLAGS = RTEMS_*FLAGS.
	Remove LIB_VARIANT from LINK_*.
	Cleanup comments.

1 files changed, 5 insertions, 57 deletions

diff --git a/testsuites/automake/compile.am b/testsuites/automake/compile.am
index 348afeb95b..9594c8fd55 100644
--- a/testsuites/automake/compile.am
+++ b/testsuites/automake/compile.am
@@ -9,65 +9,16 @@
 ## Expect frequent changes -- It deserves to be cleaned up :(
 ## -------------------------------------------------------------------------
 
-## The section below is based on make/compilers/gcc-target-default.cfg
-## used in former versions of RTEMS.
-
-##
-## Set up the flags for the toolchains:
-##
-## We are considering 3 different building schemes here:
-## * Using gcc's being able to accept -specs (aka gcc-2.8 building scheme)
-## * Using gcc's not being able to accept -specs (aka gcc-2.7.2 building
-##   scheme)
-## * Using third party toolchains (aka non-gcc building scheme)
-##
-## Automake conditionals in use:
-## RTEMS_USE_GCC     .. if we are using GCC
-
-## NOTES:
-## * The gcc-2.8 building scheme is the nominal building scheme and
-##   is actively supported.
-## * The non-gcc building scheme requires manually setting up environment
-##   variables and is hardly tested at all
-
-## CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V are the values we
-## would want the corresponding macros to be set to.
-##
-## CFLAGS_OPTIMIZE, CFLAGS_DEBUG are set by the
-## 'VARIANT=<OPTIMIZE|DEBUG>' targets to their _V values.
-
-## XCPPFLAGS, XCFLAGS, XCXXFLAGS, XASFLAGS
-## are used to add flags from the shell
-## cf. make.info ("Implicit rules/variables" for details)
-
 if RTEMS_USE_GCC
 ## All the stuff below is specific to gcc
-
-## gcc >= 2.8.x
 GCCSPECS = $(GCC_SPECS) $(RTEMS_BSP_SPECS)
-else
-## fall back to the old style compilers/*.cfg
-## CONFIG.CC is supposed to be provided by <BSP>.cfg
-include $(CONFIG.CC)
 endif # RTEMS_USE_GCC
 
 DEFS = @DEFS@
 
-CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) $(XCPPFLAGS)
-CFLAGS   = @RTEMS_CFLAGS@ $(XCFLAGS)
-## FIXME: This should be correct, but is not supported, yet
-# CXXFLAGS = @RTEMS_CXXFLAGS@ $(XCXXFLAGS)
-## Fall back to using RTEMS_CFLAGS for C++
-CXXFLAGS = @RTEMS_CFLAGS@ $(XCXXFLAGS)
-ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
-
 LINK_LIBS = $(LD_LIBS)
 
 #
-# Client compiler and support tools
-#
-
-#
 # How to compile stuff into ${ARCH} subdirectory
 #
 
@@ -135,25 +86,22 @@ depend: depend-am
 
 LINK_OBJS = \
     $(OBJS) \
-    $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%$(LIB_VARIANT).rel)
+    $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 LINK_FILES =\
     $(START_FILE) \
     $(OBJS) \
-    $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%$(LIB_VARIANT).rel)
+    $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel)
 
 ## -------------------------------------------------------------------------
 ## Setup the variant build subdirectory
 ARCH = o-optimize
 
-## These are supposed to be set in make/custom/<bsp>.cfg
-CPU_CFLAGS = @CPU_CFLAGS@
-
 ## -------------------------------------------------------------------------
-
 CC = @CC@ $(GCCSPECS)
 CXX = @CXX@ $(GCCSPECS)
 CPP = @CPP@ $(GCCSPECS)
+CCAS = @CCAS@ $(GCCSPECS)
 
 LD = @LD@
 OBJCOPY = @OBJCOPY@
@@ -163,8 +111,8 @@ STRIP = @STRIP@
 
 ##
 AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
-AM_CFLAGS =
-AM_CXXFLAGS =
+AM_CFLAGS = $(RTEMS_CFLAGS)
+AM_CXXFLAGS = $(RTEMS_CXXFLAGS)
 AM_CCASFLAGS = $(CPU_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS)
 
 clean-local: