diff --git a/ChangeLog b/ChangeLog
index 9c64d964e5..c3ee5aa0ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* automake/compile.am: Rework *FLAGS, AM_*FLAGS handling.
+
 2002-12-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* automake/compile.am: Remove hard-coded *_PROFILE_V.
diff --git a/automake/compile.am b/automake/compile.am
index c6dc0246e7..1c0b010e18 100644
--- a/automake/compile.am
+++ b/automake/compile.am
@@ -53,10 +53,9 @@ endif # RTEMS_USE_GCC
 
 DEFS = @DEFS@
 
-CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) \
-   $(DEFINES) $(XCPPFLAGS)
-CFLAGS   = @CFLAGS@ $(CPU_CFLAGS) $(XCFLAGS)
-CXXFLAGS = @CXXFLAGS@ $(CPU_CFLAGS) $(XCXXFLAGS)
+CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) $(XCPPFLAGS)
+CFLAGS   = @RTEMS_CFLAGS@ $(XCFLAGS)
+CXXFLAGS = @RTEMS_CXXFLAGS@ $(XCXXFLAGS)
 ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
 
 LINK_LIBS = $(LD_LIBS)
@@ -223,6 +222,6 @@ STRIP = @STRIP@
 
 ##
 AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
-
-AM_CFLAGS = $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
-AM_CXXFLAGS = $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
+AM_CFLAGS =
+AM_CXXFLAGS =
+AM_CCASFLAGS = $(CPU_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS)
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 99b177448e..d76b2ca41b 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* automake/compile.am: Rework *FLAGS, AM_*FLAGS handling.
+
 2002-12-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* automake/multilib.am: Don't include @RTEMS_BSP@.cfg.
diff --git a/cpukit/automake/compile.am b/cpukit/automake/compile.am
index f51621b113..4a75984334 100644
--- a/cpukit/automake/compile.am
+++ b/cpukit/automake/compile.am
@@ -52,9 +52,8 @@ endif # RTEMS_USE_GCC
 
 DEFS = @DEFS@
 
-CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) \
-   $(DEFINES) $(XCPPFLAGS) $(CPPFLAGS_GCC)
-CFLAGS   = @CFLAGS@ $(CPU_CFLAGS) $(XCFLAGS)
+CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) $(XCPPFLAGS)
+CFLAGS   = @RTEMS_CFLAGS@ $(XCFLAGS)
 ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
 
 #
@@ -168,8 +167,5 @@ CPP = @CPP@ $(GCCSPECS)
 
 ##
 AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
-
-AM_CFLAGS = $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
-
-# AM_CFLAGS = $(RTEMS_BSP_CFLAGS) $(RTEMS_CFLAGS)
+AM_CFLAGS =
 AM_CCASFLAGS = $(RTEMS_BSP_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_ASFLAGS)