diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-11 05:25:27 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-11 05:25:27 +0000 |
commit | a42f159af5540d9ad5fd88f6b63291d40b2c21bb (patch) | |
tree | 2638b6e2ca234e65ff4887e158f1671ebd81ab1f /cpukit/automake | |
parent | 2004-01-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-a42f159af5540d9ad5fd88f6b63291d40b2c21bb.tar.bz2 |
2004-01-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Remove AUTOMAKE_FILES.
* automake/compile.am: Replace contents with contents of
automake/amcompile.am.
* automake/amcompile.am, automake/lib.am: Remove.
Diffstat (limited to 'cpukit/automake')
-rw-r--r-- | cpukit/automake/amcompile.am | 80 | ||||
-rw-r--r-- | cpukit/automake/compile.am | 80 | ||||
-rw-r--r-- | cpukit/automake/lib.am | 16 |
3 files changed, 4 insertions, 172 deletions
diff --git a/cpukit/automake/amcompile.am b/cpukit/automake/amcompile.am deleted file mode 100644 index 3a0dc79534..0000000000 --- a/cpukit/automake/amcompile.am +++ /dev/null @@ -1,80 +0,0 @@ -## -## $Id$ -## - -## ------------------------------------------------------------------------- -## NOTE: This file is rather immature and has to be considered to be -## almost experimental. -## -## Expect frequent changes -- It deserves to be cleaned up :( -## ------------------------------------------------------------------------- - -## The section below is based on make/compilers/gcc-target-default.cfg -## used in former versions of RTEMS. - -## -## Set up the flags for the toolchains: -## -## We are considering 3 different building schemes here: -## * Using gcc's being able to accept -specs (aka gcc-2.8 building scheme) -## * Using gcc's not being able to accept -specs (aka gcc-2.7.2 building -## scheme) -## * Using third party toolchains (aka non-gcc building scheme) -## -## Automake conditionals in use: -## RTEMS_USE_GCC .. if we are using GCC - -## CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V are the values we -## would want the corresponding macros to be set to. -## -## CFLAGS_OPTIMIZE, CFLAGS_DEBUG are set by the -## 'VARIANT=<OPTIMIZE|DEBUG>' targets to their _V values. - -CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) -CFLAGS = @RTEMS_CFLAGS@ -ASFLAGS = $(CPU_ASFLAGS) $(CPU_CFLAGS) - -depend: - -## ------------------------------------------------------------------------- - -## translate VARIANT into VARIANT_V -VARIANT = OPTIMIZE - -VARIANT_OPTIMIZE_V = OPTIMIZE -VARIANT_DEBUG_V = DEBUG -VARIANT_optimize_V = OPTIMIZE -VARIANT_debug_V = DEBUG - -VARIANT_V = $(VARIANT_$(VARIANT)_V) - -## Setup the library suffix -LIBSUFFIX_OPTIMIZE_V = -LIBSUFFIX_DEBUG_V = _g -LIBSUFFIX__V = $(LIBSUFFIX_OPTIMIZE_V) - -LIB_VARIANT = $(LIBSUFFIX_$(VARIANT_V)_V) - -## These are supposed to be set in make/custom/<bsp>.cfg -CPU_CFLAGS = @CPU_CFLAGS@ -CFLAGS_OPTIMIZE_V = @CFLAGS_OPTIMIZE_V@ -CFLAGS_DEBUG_V = @CFLAGS_DEBUG_V@ -CFLAGS__V = $(CFLAGS_OPTIMIZE_V) - -## ------------------------------------------------------------------------ -## Setup hard-coded flags -if RTEMS_USE_GCC -## gcc >= gcc-2.8 -RTEMS_CFLAGS_OPTIMIZE_V = -RTEMS_CFLAGS_DEBUG_V = -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) - -## ------------------------------------------------------------------------- -AM_CPPFLAGS = $(RTEMS_CPPFLAGS) -AM_CFLAGS = -AM_CCASFLAGS = $(RTEMS_CPPFLAGS) $(RTEMS_ASFLAGS) diff --git a/cpukit/automake/compile.am b/cpukit/automake/compile.am index cb5cb62331..3a0dc79534 100644 --- a/cpukit/automake/compile.am +++ b/cpukit/automake/compile.am @@ -24,78 +24,17 @@ ## Automake conditionals in use: ## RTEMS_USE_GCC .. if we are using GCC -## NOTES: -## * The gcc-2.8 building scheme is the nominal building scheme and -## is actively supported. -## * The non-gcc building scheme requires manually setting up environment -## variables and is hardly tested at all - ## CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V are the values we ## would want the corresponding macros to be set to. ## ## CFLAGS_OPTIMIZE, CFLAGS_DEBUG are set by the ## 'VARIANT=<OPTIMIZE|DEBUG>' targets to their _V values. -## XCPPFLAGS, XCFLAGS, XASFLAGS -## are used to add flags from the shell -## cf. make.info ("Implicit rules/variables" for details) - -DEFS = @DEFS@ - -CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) $(XCPPFLAGS) -CFLAGS = @RTEMS_CFLAGS@ $(XCFLAGS) -ASFLAGS = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS) - -# -# How to compile stuff into ${ARCH} subdirectory -# - -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) - -CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) - -${ARCH}/%.$(OBJEXT): %.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< - -${ARCH}/%.$(OBJEXT): %.S $(ARCH)/$(dirstamp) - ${CCASCOMPILE} -o $@ -c $< - -# Make foo.rel from foo.$(OBJEXT) -${ARCH}/%.rel: ${ARCH}/%.$(OBJEXT) - ${make-rel} +CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES) +CFLAGS = @RTEMS_CFLAGS@ +ASFLAGS = $(CPU_ASFLAGS) $(CPU_CFLAGS) -# Dependency files for use by gmake -# NOTE: we don't put them into $(ARCH) -# so that 'make clean' doesn't blow it away - -DEPEND=Depends-${ARCH} - -# We deliberately don't have anything depend on the -# $(DEPEND) file; otherwise it will get rebuilt even -# on 'make clean' -# - -if RTEMS_USE_GCC -## HACK: Specific to gcc -## FIXME: The approach below is known to be conceptionally broken. -depend-gcc: $(C_FILES) $(CC_FILES) $(S_FILES) -## Use gcc -M to generate dependencies -## Replace foo.$(OBJEXT) with $(ARCH)/foo.$(OBJEXT) -## Replace $(ARCH) value with string $(ARCH) -## so that it will for debug cases - $(COMPILE) -M $^ | \ - sed -e 's?^\(.*\)\.o[ ]*:?$$(ARCH)/\1.o:?' \ - -e 's?$(ARCH)/?$$(ARCH)/?' >$(DEPEND).tmp - mv $(DEPEND).tmp $(DEPEND) - -# pull in dependencies if they exist -ifeq (${DEPEND},$(wildcard ${DEPEND})) -include ${DEPEND} -@ENDIF@ -endif -depend: depend-gcc +depend: ## ------------------------------------------------------------------------- @@ -109,17 +48,6 @@ VARIANT_debug_V = DEBUG VARIANT_V = $(VARIANT_$(VARIANT)_V) -## Setup the variant build subdirectory -ARCH_OPTIMIZE_V = o-optimize -ARCH_DEBUG_V = o-debug - -ARCH__V = $(ARCH_OPTIMIZE_V) -ARCH = $(ARCH_$(VARIANT_V)_V) - -${ARCH}/$(dirstamp): - @$(mkdir_p) $(ARCH) - @: > $(ARCH)/$(dirstamp) - ## Setup the library suffix LIBSUFFIX_OPTIMIZE_V = LIBSUFFIX_DEBUG_V = _g diff --git a/cpukit/automake/lib.am b/cpukit/automake/lib.am deleted file mode 100644 index 4c4cba5cb7..0000000000 --- a/cpukit/automake/lib.am +++ /dev/null @@ -1,16 +0,0 @@ -## -## $Id$ -## - -AR = @AR@ -RANLIB = @RANLIB@ - -ARFLAGS = ruv - -define make-library -$(RM) $@ -$(AR) $(ARFLAGS) $@ $^ -$(RANLIB) $@ -endef - -TMPINSTALL_FILES = |