diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-01 13:41:54 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-02-01 13:41:54 +0000 |
commit | 847dbbe6c70c6695803252b9f5132d777f9df3e7 (patch) | |
tree | e416d082e139ce4bc47ba202e21c1c51c483c233 /c/src/lib/libbsp/configure.in | |
parent | Removed references to non-existent include files. (diff) | |
download | rtems-847dbbe6c70c6695803252b9f5132d777f9df3e7.tar.bz2 |
Patches rtems-rc-20000118-5.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
that contains:
* The fix for the gen68360/network/Makefile.am
* automatically set permissions to 755 to scripts/buildall and
scripts-ada/buildall (I remembered a trick to achieve this :).
* automake support for libbsp/* and libcpu/* (Attn: This part will
finally break old-style configuration for all non-public cpus)
NOTES:
* This patch has only been tested for a random selection of BSPs (I
haven't rebuilt all toolchains yet).
* This patch is against rtem-cvs as of this morning (MET).
To apply:
patch -p1 <rtems-rc-20000118-5.diff
cvs rm -f ./c/src/lib/libbsp/Makefile.in
cvs rm -f ./c/src/lib/libbsp/shmdr/Makefile.in
cvs rm -f ./c/src/lib/libcpu/Makefile.in
cvs add ./c/src/lib/libbsp/Makefile.am
cvs add ./c/src/lib/libbsp/shmdr/Makefile.am
cvs add ./c/src/lib/libcpu/Makefile.am
./bootstrap
Diffstat (limited to 'c/src/lib/libbsp/configure.in')
-rw-r--r-- | c/src/lib/libbsp/configure.in | 44 |
1 files changed, 4 insertions, 40 deletions
diff --git a/c/src/lib/libbsp/configure.in b/c/src/lib/libbsp/configure.in index 20b70cfe04..f522117421 100644 --- a/c/src/lib/libbsp/configure.in +++ b/c/src/lib/libbsp/configure.in @@ -8,12 +8,10 @@ RTEMS_TOP(../../../..) AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU -AC_PROG_MAKE_SET -AC_PROG_INSTALL +AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp,$RTEMS_VERSION,no) AM_MAINTAINER_MODE RTEMS_ENABLE_MULTIPROCESSING -RTEMS_ENABLE_NETWORKING RTEMS_ENABLE_LIBCDIR RTEMS_ENABLE_BARE @@ -30,7 +28,6 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) -RTEMS_CHECK_NETWORKING(RTEMS_BSP) RTEMS_BSP_ALIAS(${RTEMS_BSP},bspdir) @@ -57,45 +54,12 @@ else RTEMS_LIBBSP_CPU_SUBDIR=$RTEMS_CPU fi AC_SUBST(RTEMS_LIBBSP_CPU_SUBDIR) - -if test ! -f ${srcdir}/${RTEMS_LIBBSP_CPU_SUBDIR}/configure.in -then - -# find all the Makefiles for the BSPs - makefiles="$makefiles $RTEMS_CPU/Makefile" - - if test -d "$srcdir/$bspcpudir$bspdir"; then - RTEMS_CHECK_MAKEFILE(${bspcpudir}$bspdir) - RTEMS_CHECK_MAKEFILE(${bspcpudir}shared) - - # HACK: sed out bsp-tools from makefiles - t="$bspcpudir$bspdir/tools" - if test -d "$srcdir/$t"; then - bsptools_cfgdirs="$bsptools_cfgdirs $t" - makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"` - fi - else - AC_MSG_ERROR([unable to find libbsp subdirectory ($bspdir) for ${RTEMS_BSP}]) - fi -else - cfg_subdirs="$RTEMS_LIBBSP_CPU_SUBDIR" -fi - -if test "$HAS_MP" = "yes"; then - makefiles="$makefiles shmdr/Makefile" -else - # HACK: sed out shmsupp/Makefile from makefiles - t="$bspcpudir$bspdir/shmsupp" - makefiles=`echo "$makefiles" | sed -e "s%$t/.*Makefile%%g"` -fi +cfg_subdirs="$RTEMS_LIBBSP_CPU_SUBDIR" AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") - -AC_CONFIG_SUBDIRS($bsptools_cfgdirs) - AC_CONFIG_SUBDIRS($cfg_subdirs) -# try to explicitly list a Makefile here +# Explicitly list all Makefiles AC_OUTPUT( Makefile -$makefiles) +shmdr/Makefile) |