From 1ea70d78ddbd7347df50103c4a915e140d913f9c Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 12 Sep 2000 20:54:13 +0000 Subject: 2000-09-12 Ralf Corsepius * aclocal/check-cxx.m4: Add AC_SUBST(CPLUS_LD_LIBS) * aclocal/prog-cc.m4: Cleanup comments, require RTEMS_ENABLE_GCC28, add automake conditionals RTEMS_USE_GCC, RTEMS_USE_GCC272. * automake/compile.am: Replaced. * automake/local.am: Remove building variant handling. --- automake/local.am | 44 +------------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) (limited to 'automake/local.am') diff --git a/automake/local.am b/automake/local.am index 324a803a37..ca146e837e 100644 --- a/automake/local.am +++ b/automake/local.am @@ -1,48 +1,5 @@ ## $Id$ -## NOTE: This is a temporary work-around to keep -## RTEMS's non automake standard make targets working. -## Once automake is fully integrated these make targets -## and this file will probably be removed - -## translate VARIANT into VARIANT_V -VARIANT = OPTIMIZE - -VARIANT_OPTIMIZE_V = OPTIMIZE -VARIANT_DEBUG_V = DEBUG -VARIANT_PROFILE_V = PROFILE -VARIANT_optimize_V = OPTIMIZE -VARIANT_debug_V = DEBUG -VARIANT_profile_V = PROFILE - -VARIANT_V = $(VARIANT_$(VARIANT)_V) - -## 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) - -## Setup the library suffix -LIBSUFFIX_OPTIMIZE_V = -LIBSUFFIX_DEBUG_V = _g -LIBSUFFIX_PROFILE_V = _p - -LIBSUFFIX__V = $(LIBSUFFIX_OPTIMIZE_V) -LIB_VARIANT = $(LIBSUFFIX_$(VARIANT_V)_V) - -LIBSUFFIX_VA = $(LIB_VARIANT).a - -## These are supposed to be set in make/custom/.cfg -## CFLAGS_OPTIMIZE_V = -## CFLAGS_DEBUG_V = -## CFLAGS_PROFILE_V = - -CFLAGS__V = $(CFLAGS_OPTIMIZE_V) -AM_CFLAGS += $(CFLAGS_$(VARIANT_V)_V) - debug: @echo @echo "\"make debug\" is obsolete, instead use:" @@ -78,3 +35,4 @@ distclean-local: $(RM) Depends-o-optimize Depends-o-debug Depends-o-profile PROJECT_TOOLS = $(PROJECT_RELEASE)/build-tools + -- cgit v1.2.3