From fc40d5d4a81267faeb7f6ff4d890dd454910f226 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 11 Oct 2001 16:38:05 +0000 Subject: 2001-10-09 Ralf Corsepius * Makefile.am: Use @subdirs@ instead of RTEMS_LIBBSP_CPU_SUBDIR. * configure.in: AC_PREREQ(2.52), apply RTEMS_CPU_SUBDIRS, remove RTEMS_LIBBSP_CPU_SUBDIR. --- c/src/lib/libbsp/ChangeLog | 6 ++++++ c/src/lib/libbsp/Makefile.am | 2 +- c/src/lib/libbsp/configure.in | 9 +++------ 3 files changed, 10 insertions(+), 7 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libbsp/ChangeLog b/c/src/lib/libbsp/ChangeLog index 177c85f52c..fae99b1f98 100644 --- a/c/src/lib/libbsp/ChangeLog +++ b/c/src/lib/libbsp/ChangeLog @@ -1,3 +1,9 @@ +2001-10-09 Ralf Corsepius + + * Makefile.am: Use @subdirs@ instead of RTEMS_LIBBSP_CPU_SUBDIR. + * configure.in: AC_PREREQ(2.52), apply RTEMS_CPU_SUBDIRS, remove + RTEMS_LIBBSP_CPU_SUBDIR. + 2001-09-28 Joel Sherrill * shared/bootcard.c, shared/main.c: Now call int c_rtems_main() diff --git a/c/src/lib/libbsp/Makefile.am b/c/src/lib/libbsp/Makefile.am index e501761611..0588243fb3 100644 --- a/c/src/lib/libbsp/Makefile.am +++ b/c/src/lib/libbsp/Makefile.am @@ -11,7 +11,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal # level as the CPUs. If we are building the bare BSP, then descend # into that directory. -SUBDIRS = include shared shmdr @RTEMS_LIBBSP_CPU_SUBDIR@ +SUBDIRS = include shared shmdr @subdirs@ EXTRA_DIST = MERGE.PROCEDURE bsp.am diff --git a/c/src/lib/libbsp/configure.in b/c/src/lib/libbsp/configure.in index 825ceab3ea..a5575014e8 100644 --- a/c/src/lib/libbsp/configure.in +++ b/c/src/lib/libbsp/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl dnl $Id$ -AC_PREREQ(2.13) +AC_PREREQ(2.52) AC_INIT(README) RTEMS_TOP(../../../..) AC_CONFIG_AUX_DIR(../../../..) @@ -28,15 +28,12 @@ RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir) # Is there code where there should be for this BSP? # The bare bsp is a special case as it is not under the RTEMS_CPU path if test "$bspdir" = "bare" ; then - RTEMS_LIBBSP_CPU_SUBDIR="bare" + AC_CONFIG_SUBDIRS([bare]) else - RTEMS_LIBBSP_CPU_SUBDIR=$RTEMS_CPU + RTEMS_CPU_SUBDIRS fi -AC_SUBST(RTEMS_LIBBSP_CPU_SUBDIR) -cfg_subdirs="$RTEMS_LIBBSP_CPU_SUBDIR" AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") -AC_CONFIG_SUBDIRS($cfg_subdirs) RTEMS_PROJECT_ROOT -- cgit v1.2.3