From adb85dd473af5c9a72e9da9b7fe013d1b216abc3 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Sat, 21 Apr 2018 10:22:08 +0200 Subject: bsps: Move make/custom/* files to bsps Adjust various build files. Remove automatic generation of the c/src/lib/libbsp/*/acinclude.m4 files from bootstrap script. This patch is a part of the BSP source reorganization. Update #3285. --- bootstrap | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'bootstrap') diff --git a/bootstrap b/bootstrap index a0c6eda1f2..3115ee0678 100755 --- a/bootstrap +++ b/bootstrap @@ -36,36 +36,6 @@ usage() exit 1 } -generate_bspdir_acinclude() -{ -cat << EOF > acinclude.m4~ -# RTEMS_CHECK_BSPDIR(RTEMS_BSP_FAMILY) -AC_DEFUN([RTEMS_CHECK_BSPDIR], -[ - case "\$1" in -EOF - -for i in `echo */make | tr " " "\n" | LANG=C LC_COLLATE=C sort`; do - d=`dirname $i` -cat << EOF >> acinclude.m4~ - $d ) - AC_CONFIG_SUBDIRS([$d]);; -EOF -done -cat << EOF >> acinclude.m4~ - *) - AC_MSG_ERROR([Invalid BSP]);; - esac -]) -EOF -if cmp -s acinclude.m4 acinclude.m4~ 2>/dev/null; then - echo "acinclude.m4 is unchanged" -else - cp acinclude.m4~ acinclude.m4 -fi -rm -f acinclude.m4~ -} - if test ! -f $top_srcdir/aclocal/version.m4; then echo "${progname}:" echo " Installation problem: Can't find file aclocal/version.m4" @@ -209,8 +179,6 @@ generate) configure=`basename $i` ( test "$quiet" = "true" || echo "$dir" cd $dir - test -n "`grep RTEMS_CHECK_BSPDIR ${configure}`" && \ - generate_bspdir_acinclude pat="s,\$(RTEMS_TOPdir),${aclocal_dir},g" aclocal_args=`grep '^[ ]*ACLOCAL_AMFLAGS' Makefile.am | \ sed -e 's%.*ACLOCAL_AMFLAGS.*\=[ ]*%%g' -e $pat ` @@ -241,8 +209,6 @@ autoreconf) configure=`basename $i` ( test "$quiet" = "true" || echo "$dir" cd $dir - test -n "`grep RTEMS_CHECK_BSPDIR ${configure}`" && \ - generate_bspdir_acinclude ${AUTORECONF} -i --no-recursive $verbose test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \ && echo timestamp > stamp-h.in -- cgit v1.2.3