summaryrefslogtreecommitdiffstats
path: root/automake
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-12-06 13:07:15 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-12-06 13:07:15 +0000
commitbaa8dd7cb078c31344e0169bf77fc5f5ec103eef (patch)
tree802e266850564e02f22a20b2b2390abd70fc8a5c /automake
parent2002-12-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-baa8dd7cb078c31344e0169bf77fc5f5ec103eef.tar.bz2
2002-12-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* automake/compile.am: Rework *FLAGS, AM_*FLAGS handling.
Diffstat (limited to 'automake')
-rw-r--r--automake/compile.am13
1 files changed, 6 insertions, 7 deletions
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)