From daaacdb7cc48d158c26b187ccb17fe5381bfc7b8 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 9 Aug 2002 08:26:28 +0000 Subject: 2002-08-09 Ralf Corsepius * Makefile.am: Use @RTEMS_BSP_FAMILY@ instead of $(@RTEMS_BSP_FAMILY). * configure.ac: Remove RTEMS_BSP_ALIAS. Add RTEMS_CHECK_BSP_CACHE. Use RTEMS_BSP_FAMILY to detect the bare BSP. --- c/src/wrapup/ChangeLog | 7 +++++++ c/src/wrapup/Makefile.am | 2 +- c/src/wrapup/configure.ac | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) (limited to 'c/src') diff --git a/c/src/wrapup/ChangeLog b/c/src/wrapup/ChangeLog index f6c2f4eb34..d0c5e52563 100644 --- a/c/src/wrapup/ChangeLog +++ b/c/src/wrapup/ChangeLog @@ -1,3 +1,10 @@ +2002-08-09 Ralf Corsepius + + * Makefile.am: Use @RTEMS_BSP_FAMILY@ instead of $(@RTEMS_BSP_FAMILY). + * configure.ac: Remove RTEMS_BSP_ALIAS. + Add RTEMS_CHECK_BSP_CACHE. + Use RTEMS_BSP_FAMILY to detect the bare BSP. + 2002-07-22 Ralf Corsepius * configure.ac: AC_CONFIG_SRCDIR([../libmisc]). diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index 924a26b0bc..cffee8e14d 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -21,7 +21,7 @@ LIBRDBG = $(PROJECT_RELEASE)/lib/librdbg$(LIB_VARIANT).a endif if HAS_LIBBSP -LIBBSP = ../lib/libbsp/@RTEMS_CPU@/$(RTEMS_BSP_FAMILY)/wrapup/$(ARCH)/libbsp.a +LIBBSP = ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a endif SRCS = $(LIBBSP) $(LIBNETWORKING) $(LIBRDBG) \ diff --git a/c/src/wrapup/configure.ac b/c/src/wrapup/configure.ac index 276b41999a..31a933c8cb 100644 --- a/c/src/wrapup/configure.ac +++ b/c/src/wrapup/configure.ac @@ -21,11 +21,11 @@ RTEMS_ENABLE_MULTILIB RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CPU RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) -RTEMS_BSP_ALIAS(${RTEMS_BSP},bspalias) +RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) # The bare bsp doesn't have libbsp.a # FIXME: We should use a feature based check, here -AM_CONDITIONAL(HAS_LIBBSP,[! test "$bspalias" = "bare"]) +AM_CONDITIONAL(HAS_LIBBSP,[! test "$RTEMS_BSP_FAMILY" = "bare"]) RTEMS_CHECK_NETWORKING(RTEMS_BSP) if test "$HAS_NETWORKING" = "yes"; then -- cgit v1.2.3