diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-02-18 13:20:59 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-02-18 13:20:59 +0000 |
| commit | f7276a9bdfa68ca2a88d5dbd3fc067b8aec4227a (patch) | |
| tree | 6707575e977f8b38d49486c4bcf7e146001a1244 /automake | |
| parent | 2003-02-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-f7276a9bdfa68ca2a88d5dbd3fc067b8aec4227a.tar.bz2 | |
2003-02-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/rtems-top.m4: Set PROJECT_ROOT unconditionally.
* automake/local.am: Remove $(ARCH), clean-local.
* automake/compile.am: Add $(ARCH), clean-local.
Set CXXFLAGS = @RTEMS_CFLAGS@ $(XCXXFLAGS).
Diffstat (limited to 'automake')
| -rw-r--r-- | automake/compile.am | 12 | ||||
| -rw-r--r-- | automake/local.am | 7 |
2 files changed, 11 insertions, 8 deletions
diff --git a/automake/compile.am b/automake/compile.am index abe0a8acfa..f7aa280ec3 100644 --- a/automake/compile.am +++ b/automake/compile.am @@ -55,7 +55,10 @@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) $(XCPPFLAGS) CFLAGS = @RTEMS_CFLAGS@ $(XCFLAGS) -CXXFLAGS = @RTEMS_CXXFLAGS@ $(XCXXFLAGS) +## 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) @@ -219,3 +222,10 @@ AM_CPPFLAGS = $(RTEMS_CPPFLAGS) AM_CFLAGS = AM_CXXFLAGS = AM_CCASFLAGS = $(CPU_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS) + +${ARCH}: + mkdir ${ARCH} + +clean-local: + $(RM) -r o-optimize o-debug o-profile $(CLEANDIRS) + $(RM) Depends-o-optimize.tmp Depends-o-debug.tmp Depends-o-profile.tmp diff --git a/automake/local.am b/automake/local.am index 51572dccc5..013d48f70a 100644 --- a/automake/local.am +++ b/automake/local.am @@ -24,12 +24,5 @@ depend-am: depend: depend-am .PHONY: depend depend-am -${ARCH}: - mkdir ${ARCH} - -clean-local: - $(RM) -r o-optimize o-debug o-profile $(CLEANDIRS) - $(RM) Depends-o-optimize.tmp Depends-o-debug.tmp Depends-o-profile.tmp - PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools |