diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-02-12 14:27:25 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-02-12 14:27:25 +0000 |
| commit | 0724e79bef5686ef2b510173597be343fbdb4683 (patch) | |
| tree | a519520563286fcdff0417e6397d75315fcaf7e9 /c | |
| parent | .cvsignore: Remove (Unused). (diff) | |
| download | rtems-0724e79bef5686ef2b510173597be343fbdb4683.tar.bz2 | |
2004-02-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Don't include host.am.
* automake/compile.am: Further cleanups.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/Makefile.am | 1 | ||||
| -rw-r--r-- | c/src/automake/compile.am | 32 |
3 files changed, 8 insertions, 30 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 964a3eb57b..0c081309bc 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,5 +1,10 @@ 2004-02-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * Makefile.am: Don't include host.am. + * automake/compile.am: Further cleanups. + +2004-02-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * automake/lib.am: Remove (Unused). 2004-02-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> diff --git a/c/src/Makefile.am b/c/src/Makefile.am index 659dd99229..e800ee409d 100644 --- a/c/src/Makefile.am +++ b/c/src/Makefile.am @@ -46,4 +46,3 @@ pkgconfig_DATA = @host_alias@-@RTEMS_BSP@.pc DISTCLEANFILES += @host_alias@-@RTEMS_BSP@.pc include $(top_srcdir)/automake/subdirs.am -include $(top_srcdir)/automake/host.am diff --git a/c/src/automake/compile.am b/c/src/automake/compile.am index 0aee6951aa..e494314ed5 100644 --- a/c/src/automake/compile.am +++ b/c/src/automake/compile.am @@ -38,38 +38,22 @@ if RTEMS_USE_GCC ## All the stuff below is specific to gcc - -## gcc >= 2.8.x GCCSPECS = $(GCC_SPECS) $(RTEMS_BSP_SPECS) -else -## fall back to the old style compilers/*.cfg -## CONFIG.CC is supposed to be provided by <BSP>.cfg -include $(CONFIG.CC) endif # RTEMS_USE_GCC -DEFS = @DEFS@ - CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) CFLAGS = @RTEMS_CFLAGS@ ## FIXME: This should be correct, but is not supported, yet -# CXXFLAGS = @RTEMS_CXXFLAGS@ $(XCXXFLAGS) +# CXXFLAGS = @RTEMS_CXXFLAGS@ ## Fall back to using RTEMS_CFLAGS for C++ -CXXFLAGS = @RTEMS_CFLAGS@ $(XCXXFLAGS) -ASFLAGS = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS) +CXXFLAGS = @RTEMS_CFLAGS@ +ASFLAGS = $(CPU_ASFLAGS) $(CPU_CFLAGS) depend: if RTEMS_USE_GCC ## gcc >= 2.8 RTEMS_RELLDFLAGS = -qnolinkcmds -nostdlib -Wl,-r -define make-rel - $(LINK) $(RTEMS_RELLDFLAGS) $^ -endef -else -## non-gcc -define make-rel - $(LINK) $(RTEMS_RELLDFLAGS) $^ -endef endif ## ------------------------------------------------------------------------- @@ -103,10 +87,6 @@ if RTEMS_USE_GCC ## gcc >= gcc-2.8 RTEMS_CFLAGS_OPTIMIZE_V = RTEMS_CFLAGS_DEBUG_V = -qrtems_debug -Wno-unused - -## non-gcc -## We can't guess what flags might be required here. -## Pass the values from the environment if you want to apply them. endif RTEMS_CFLAGS__V = $(RTEMS_CFLAGS_OPTIMIZE_V) @@ -116,12 +96,6 @@ CC = @CC@ $(GCCSPECS) CXX = @CXX@ $(GCCSPECS) CPP = @CPP@ $(GCCSPECS) -LD = @LD@ -OBJCOPY = @OBJCOPY@ -NM = @NM@ -SIZE = @SIZE@ -STRIP = @STRIP@ - ## AM_CPPFLAGS = $(RTEMS_CPPFLAGS) AM_CFLAGS = |