From baa8dd7cb078c31344e0169bf77fc5f5ec103eef Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Fri, 6 Dec 2002 13:07:15 +0000
Subject: 2002-12-06	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* automake/compile.am: Rework *FLAGS, AM_*FLAGS handling.
---
 cpukit/ChangeLog           |  4 ++++
 cpukit/automake/compile.am | 10 +++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'cpukit')

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)
-- 
cgit v1.2.3