diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-12-06 13:07:15 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-12-06 13:07:15 +0000 |
| commit | baa8dd7cb078c31344e0169bf77fc5f5ec103eef (patch) | |
| tree | 802e266850564e02f22a20b2b2390abd70fc8a5c | |
| parent | 2002-12-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-baa8dd7cb078c31344e0169bf77fc5f5ec103eef.tar.bz2 | |
2002-12-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* automake/compile.am: Rework *FLAGS, AM_*FLAGS handling.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | automake/compile.am | 13 | ||||
| -rw-r--r-- | cpukit/ChangeLog | 4 | ||||
| -rw-r--r-- | cpukit/automake/compile.am | 10 |
4 files changed, 17 insertions, 14 deletions
@@ -1,5 +1,9 @@ 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. Add autoconf-supplied CPU_CFLAGS, CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V, CFLAGS_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,5 +1,9 @@ 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. * automake/compile.am: Remove hard-coded CFLAGS_PROFILE_V. Add autoconf-supplied CPU_CFLAGS, CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V, 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) |