From 508c509dfbab2070a5705ba02efd8c51eef7b3a7 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 2 May 2003 20:28:05 +0000 Subject: [PATCH] 2003-05-02 Ralf Corsepius * aclocal/env-rtemscpu.m4: Merge-in env-rtemsbsp.m4. * aclocal/env-rtemsbsp.m4: Remove. * aclocal/enable-rtemsbsp.m4: Remove. --- cpukit/ChangeLog | 6 +++++ cpukit/aclocal/enable-rtemsbsp.m4 | 16 ------------ cpukit/aclocal/env-rtemsbsp.m4 | 41 ------------------------------- 3 files changed, 6 insertions(+), 57 deletions(-) delete mode 100644 cpukit/aclocal/enable-rtemsbsp.m4 delete mode 100644 cpukit/aclocal/env-rtemsbsp.m4 diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index f1247e19a6..7094032717 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2003-05-02 Ralf Corsepius + + * aclocal/env-rtemscpu.m4: Merge-in env-rtemsbsp.m4. + * aclocal/env-rtemsbsp.m4: Remove. + * aclocal/enable-rtemsbsp.m4: Remove. + 2003-05-02 Ralf Corsepius * aclocal/env-rtemscpu.m4: Remove stray '/' in setting up diff --git a/cpukit/aclocal/enable-rtemsbsp.m4 b/cpukit/aclocal/enable-rtemsbsp.m4 deleted file mode 100644 index a4c2114e59..0000000000 --- a/cpukit/aclocal/enable-rtemsbsp.m4 +++ /dev/null @@ -1,16 +0,0 @@ -dnl $Id$ - -dnl Override the set of BSPs to be built. -dnl used by the toplevel configure script -dnl RTEMS_ENABLE_RTEMSBSP(rtems_bsp_list) -AC_DEFUN(RTEMS_ENABLE_RTEMSBSP, -[ -AC_BEFORE([$0], [RTEMS_ENV_RTEMSBSP])dnl -AC_ARG_ENABLE(rtemsbsp, -AC_HELP_STRING([--enable-rtemsbsp="bsp1 bsp2 .."], -[BSPs to include in build]), -[case "${enableval}" in - yes|no) AC_MSG_ERROR([missing argument to --enable-rtemsbsp=\"bsp1 bsp2\"]);; - *) $1=$enableval;; -esac],[$1=""]) -]) diff --git a/cpukit/aclocal/env-rtemsbsp.m4 b/cpukit/aclocal/env-rtemsbsp.m4 deleted file mode 100644 index 531af6e881..0000000000 --- a/cpukit/aclocal/env-rtemsbsp.m4 +++ /dev/null @@ -1,41 +0,0 @@ -dnl $Id$ - -dnl Pass a single BSP via an environment variable -dnl used by per BSP configure scripts -AC_DEFUN(RTEMS_ENV_RTEMSBSP, -[dnl -AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl - -AC_ARG_VAR([CPU_CFLAGS],[]) -AC_ARG_VAR([CFLAGS_OPTIMIZE_V],[]) -AC_ARG_VAR([CFLAGS_DEBUG_V],[]) -AC_ARG_VAR([CFLAGS_PROFILE_V],[]) - -AC_ARG_VAR([RTEMS_BSP],[RTEMS_BSP to build]) -AC_MSG_CHECKING([for RTEMS_BSP]) -AC_CACHE_VAL(rtems_cv_RTEMS_BSP, -[dnl - test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$RTEMS_BSP"; -])dnl -if test -z "$rtems_cv_RTEMS_BSP"; then - AC_MSG_ERROR([Missing RTEMS_BSP]) -fi -RTEMS_BSP="$rtems_cv_RTEMS_BSP" -AC_MSG_RESULT(${RTEMS_BSP}) -AC_SUBST(RTEMS_BSP) - -PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include" -AC_SUBST(PROJECT_INCLUDE) - -project_libdir="${PROJECT_ROOT}/$RTEMS_BSP/lib" -AC_SUBST(project_libdir) - -RTEMS_ENABLE_BARE -AC_SUBST(BARE_CPU_MODEL) -AC_SUBST(BARE_CPU_CFLAGS) - -AM_CONDITIONAL([MULTILIB],[false]) - -includedir="\${exec_prefix}/${RTEMS_BSP}/lib/include" -libdir="\${exec_prefix}/${RTEMS_BSP}/lib" -])