2004-02-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am: Don't include host.am.
	* automake/compile.am: Further cleanups.
This commit is contained in:
Ralf Corsepius
2004-02-12 14:27:25 +00:00
parent 8c760486d6
commit 0724e79bef
3 changed files with 8 additions and 30 deletions

View File

@@ -1,3 +1,8 @@
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> 2004-02-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* automake/lib.am: Remove (Unused). * automake/lib.am: Remove (Unused).

View File

@@ -46,4 +46,3 @@ pkgconfig_DATA = @host_alias@-@RTEMS_BSP@.pc
DISTCLEANFILES += @host_alias@-@RTEMS_BSP@.pc DISTCLEANFILES += @host_alias@-@RTEMS_BSP@.pc
include $(top_srcdir)/automake/subdirs.am include $(top_srcdir)/automake/subdirs.am
include $(top_srcdir)/automake/host.am

View File

@@ -38,38 +38,22 @@
if RTEMS_USE_GCC if RTEMS_USE_GCC
## All the stuff below is specific to gcc ## All the stuff below is specific to gcc
## gcc >= 2.8.x
GCCSPECS = $(GCC_SPECS) $(RTEMS_BSP_SPECS) 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 endif # RTEMS_USE_GCC
DEFS = @DEFS@
CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES)
CFLAGS = @RTEMS_CFLAGS@ CFLAGS = @RTEMS_CFLAGS@
## FIXME: This should be correct, but is not supported, yet ## 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++ ## Fall back to using RTEMS_CFLAGS for C++
CXXFLAGS = @RTEMS_CFLAGS@ $(XCXXFLAGS) CXXFLAGS = @RTEMS_CFLAGS@
ASFLAGS = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS) ASFLAGS = $(CPU_ASFLAGS) $(CPU_CFLAGS)
depend: depend:
if RTEMS_USE_GCC if RTEMS_USE_GCC
## gcc >= 2.8 ## gcc >= 2.8
RTEMS_RELLDFLAGS = -qnolinkcmds -nostdlib -Wl,-r RTEMS_RELLDFLAGS = -qnolinkcmds -nostdlib -Wl,-r
define make-rel
$(LINK) $(RTEMS_RELLDFLAGS) $^
endef
else
## non-gcc
define make-rel
$(LINK) $(RTEMS_RELLDFLAGS) $^
endef
endif endif
## ------------------------------------------------------------------------- ## -------------------------------------------------------------------------
@@ -103,10 +87,6 @@ if RTEMS_USE_GCC
## gcc >= gcc-2.8 ## gcc >= gcc-2.8
RTEMS_CFLAGS_OPTIMIZE_V = RTEMS_CFLAGS_OPTIMIZE_V =
RTEMS_CFLAGS_DEBUG_V = -qrtems_debug -Wno-unused 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 endif
RTEMS_CFLAGS__V = $(RTEMS_CFLAGS_OPTIMIZE_V) RTEMS_CFLAGS__V = $(RTEMS_CFLAGS_OPTIMIZE_V)
@@ -116,12 +96,6 @@ CC = @CC@ $(GCCSPECS)
CXX = @CXX@ $(GCCSPECS) CXX = @CXX@ $(GCCSPECS)
CPP = @CPP@ $(GCCSPECS) CPP = @CPP@ $(GCCSPECS)
LD = @LD@
OBJCOPY = @OBJCOPY@
NM = @NM@
SIZE = @SIZE@
STRIP = @STRIP@
## ##
AM_CPPFLAGS = $(RTEMS_CPPFLAGS) AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
AM_CFLAGS = AM_CFLAGS =