2002-11-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* custom/default.cfg: Remove RTEMS_BSP_SPECS. Remove reference to
	obsolete Makefile.
	* leaf.cfg: Various changes to LIBVARIANT processing.
	* main.cfg: Ditto.
This commit is contained in:
Ralf Corsepius
2002-11-12 10:32:00 +00:00
parent fae851c2e7
commit 393d271670
4 changed files with 50 additions and 43 deletions

View File

@@ -1,3 +1,10 @@
2002-11-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* custom/default.cfg: Remove RTEMS_BSP_SPECS. Remove reference to
obsolete Makefile.
* leaf.cfg: Various changes to LIBVARIANT processing.
* main.cfg: Ditto.
2002-11-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add compilers/*.

View File

@@ -15,7 +15,6 @@ include $(RTEMS_ROOT)/make/main.cfg
include $(exec_prefix)/$(RTEMS_BSP)/make/bsp.cfg
# use the inline functions instead of the macros
# ref: src/exec/generic/Makefile
ifeq ($(RTEMS_USE_MACROS),yes)
INLINE=macros
INLINE_UPCASE=
@@ -27,9 +26,6 @@ endif
## Target compiler config file, if any
CONFIG.CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg
## GCC specs extension file location
RTEMS_BSP_SPECS = $(PROJECT_ROOT)/$(RTEMS_BSP)/lib/bsp_specs
# Base name of start file
START_BASE=start

View File

@@ -34,6 +34,19 @@ MANAGERS := $(patsubst all, $(MANAGER_LIST), $(MANAGERS))
# and finally rip out duplicates
MANAGERS := $(sort $(MANAGERS))
#
# LIBSUFFIX_VA, will "index" into LIBSUFF-*-v macros and
# convert our ${ARCH} back into .a or _g.a or _p.a based on debug or profile.
# Useful for installing libraries.
#
LIBSUFFIX_OPTIMIZE_V=
LIBSUFFIX_DEBUG_V=_g
LIBSUFFIX_PROFILE_V=_p
LIB_VARIANT=$(LIBSUFFIX_$(VARIANT_V)_V)
LIBSUFFIX_VA = $(LIB_VARIANT).a
# Pull in the desired "target" compiler
# Programs built on the host use automake generated rules.
# This will not change $(ARCH) -- binaries will still be place as per target
@@ -67,11 +80,11 @@ endif
# build something "the same" way.
#
VARIANT-o-optimize-v =
VARIANT-o-debug-v = debug
VARIANT-o-profile-v = profile
VARIANT-OPTIMIZE-v =
VARIANT-DEBUG-v = debug
VARIANT-PROFILE-v = profile
VARIANT_VA = $(VARIANT-$(ARCH)-v)
VARIANT_VA = $(VARIANT-$(VARIANT_V)-v)
#
# TARGET_VA will convert $@ (expected to be 'debug' or 'profile' etc.)
@@ -84,19 +97,6 @@ TARGET_profile_V = all
TARGET_VA = $(TARGET_$@_V)
#
# LIBSUFFIX_VA, will "index" into LIBSUFF-*-v macros and
# convert our ${ARCH} back into .a or _g.a or _p.a based on debug or profile.
# Useful for installing libraries.
#
LIBSUFFIX_o-optimize_V=
LIBSUFFIX_o-debug_V=_g
LIBSUFFIX_o-profile_V=_p
LIB_VARIANT=$(LIBSUFFIX_$(ARCH)_V)
LIBSUFFIX_VA = $(LIB_VARIANT).a
#
# Builtin clean and distclean rules
# Individual makefiles can add stuff via CLEAN_ADDITIONS and CLOBBER_ADDITIONS

View File

@@ -6,6 +6,14 @@
# Make(1) configuration file include'd by all Makefile's
#
#
# Initial target for make(1)
# Once this is established we can safely include other targets
# within this make-include file.
#
default_target: all
#
# where things are relative to PROJECT_ROOT; shouldn't need to change,
# but could be overridden in custom files.
@@ -16,29 +24,28 @@ PROJECT_BIN=$(PROJECT_ROOT)/bin
PROJECT_INCLUDE=$(PROJECT_RELEASE)/lib/include
PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools
#
# Target architecture; may be changed as per 'make "ARCH=debug"'
# This is where the object files get put.
#
## translate VARIANT into VARIANT_V
VARIANT = OPTIMIZE
ifeq ($(VARIANT),)
ARCH=o-optimize
VARIANT=
else
ifeq ($(VARIANT),DEBUG)
ARCH=o-debug
VARIANT=DEBUG
endif
endif
VARIANT_OPTIMIZE_V = OPTIMIZE
VARIANT_DEBUG_V = DEBUG
VARIANT_PROFILE_V = PROFILE
VARIANT_optimize_V = OPTIMIZE
VARIANT_debug_V = DEBUG
VARIANT_profile_V = PROFILE
#
# Initial target for make(1)
# Once this is established we can safely include other targets
# within this make-include file.
#
VARIANT_V = $(VARIANT_$(VARIANT)_V)
default_target: all
## Setup the variant build subdirectory
ARCH_OPTIMIZE_V = o-optimize
ARCH_DEBUG_V = o-debug
ARCH_PROFILE_V = o-profile
ARCH__V = $(ARCH_OPTIMIZE_V)
ARCH = $(ARCH_$(VARIANT_V)_V)
$(ARCH):
test -d ${ARCH} || mkdir $(ARCH)
#
# Default makefile name
# May be overridden by command line macro assignment
@@ -64,9 +71,6 @@ RECURSE_TARGETS=all depend install \
preinstall-recursive \
$(TARGET_VARIANTS)
${ARCH}:
test -d ${ARCH} || mkdir ${ARCH}
ifndef AUTOMAKE
distclean-generic:
-$(RM) .#* $(CONFIG_CLEAN_FILES)