diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-12-01 08:01:04 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2002-12-01 08:01:04 +0000 |
| commit | 29d82b2506a1931f320df9ca758f4de62ac1a60e (patch) | |
| tree | 266fb583f7b6a2dcea2f91f568b9398d2c65d49e | |
| parent | 2002-11-29 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-29d82b2506a1931f320df9ca758f4de62ac1a60e.tar.bz2 | |
2002-12-01 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* automake/compile.am: Remove LDFLAGS_INCOMPLETE.
Remove LDFLAGS.
Add CCAS, CCASCOMPILE.
Remove compilation rules for *.cpp, *.cxx, *.C.
Use CCASCOMPILE to compile *.S.
Add -pg to RTEMS_CFLAGS_PROFILE_V.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | automake/compile.am | 26 |
2 files changed, 15 insertions, 20 deletions
@@ -1,3 +1,12 @@ +2002-12-01 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * automake/compile.am: Remove LDFLAGS_INCOMPLETE. + Remove LDFLAGS. + Add CCAS, CCASCOMPILE. + Remove compilation rules for *.cpp, *.cxx, *.C. + Use CCASCOMPILE to compile *.S. + Add -pg to RTEMS_CFLAGS_PROFILE_V. + 2002-11-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * configure.ac: Remove c/make. diff --git a/automake/compile.am b/automake/compile.am index fb8015fb1b..7a577a6308 100644 --- a/automake/compile.am +++ b/automake/compile.am @@ -66,12 +66,6 @@ CFLAGS_PROFILE_V=-pg CXXFLAGS_PROFILE_V=-pg LDFLAGS_PROFILE_V = -# ld flag for incomplete link -LDFLAGS_INCOMPLETE = -r - -# ld flags for profiling, debugging -LDFLAGS=$(LDFLAGS_PROFILE) $(LDFLAGS_DEBUG) - # # Client compiler and support tools # @@ -92,6 +86,10 @@ CXXLD = $(CXX) CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ +CCAS = $(CC) +CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) + +# OBSOLETE: Don't use AS = $(CC) ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS) @@ -103,21 +101,9 @@ ${ARCH}/%.o: %.cc test -d $(ARCH) || mkdir $(ARCH) ${CXXCOMPILE} -o $@ -c $< -${ARCH}/%.o: %.cpp - test -d $(ARCH) || mkdir $(ARCH) - ${CXXCOMPILE} -o $@ -c $< - -${ARCH}/%.o: %.cxx - test -d $(ARCH) || mkdir $(ARCH) - ${CXXCOMPILE} -o $@ -c $< - -${ARCH}/%.o: %.C - test -d $(ARCH) || mkdir $(ARCH) - ${CXXCOMPILE} -o $@ -c $< - ${ARCH}/%.o: %.S test -d $(ARCH) || mkdir $(ARCH) - ${ASCOMPILE} -DASM -o $@ -c $< + ${CCASCOMPILE} -DASM -o $@ -c $< # Dependency files for use by gmake # NOTE: we don't put them into $(ARCH) @@ -219,7 +205,7 @@ if RTEMS_USE_GCC ## gcc >= gcc-2.8 RTEMS_CFLAGS_OPTIMIZE_V = RTEMS_CFLAGS_DEBUG_V = -qrtems_debug -Wno-unused -RTEMS_CFLAGS_PROFILE_V = +RTEMS_CFLAGS_PROFILE_V = -pg ## non-gcc ## We can't guess what flags might be required here. |