diff options
| -rwxr-xr-x | bootstrap | 24 | ||||
| -rwxr-xr-x | usrp2/firmware/bootstrap | 16 | ||||
| -rwxr-xr-x | volk/bootstrap | 23 |
3 files changed, 26 insertions, 37 deletions
@@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2001-2011 Free Software Foundation, Inc. +# Copyright 2001,2005,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -19,20 +19,16 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -srcdir=$(cd $(dirname $0) ; pwd) -echo "Bootstrap'n gnuradio... ${srcdir}" +rm -fr config.cache autom4te*.cache -(cd ${srcdir} ; rm -fr config.cache autom4te*.cache) -(cd ${srcdir} ; autoconf) -(cd ${srcdir} ; autoheader) -(cd ${srcdir} ; libtoolize --automake) -(cd ${srcdir} ; automake --add-missing -Wno-portability -Wno-override -Wnone) +aclocal -I config +autoconf +autoheader +libtoolize --automake +automake --add-missing -Wno-portability -Wno-override -Wnone +#automake --add-missing -Wno-portability # Run bootstrap in any subprojects -subprojects="usrp2/firmware -volk" -for dir in ${subprojects}; do - (mkdir -p ${dir}) #ensure the build dir exists - (cd ${dir} ; sh ${srcdir}/${dir}/bootstrap) -done +(cd usrp2/firmware ; ./bootstrap) +(cd volk ; ./bootstrap) diff --git a/usrp2/firmware/bootstrap b/usrp2/firmware/bootstrap index a72eced6b..4106d4746 100755 --- a/usrp2/firmware/bootstrap +++ b/usrp2/firmware/bootstrap @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2001-2011 Free Software Foundation, Inc. +# Copyright 2001,2005 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -19,14 +19,12 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -srcdir=$(cd $(dirname $0) ; pwd) -echo "Bootstrap'n usrp2 firmware... ${srcdir}" +rm -fr config.cache autom4te*.cache -(cd ${srcdir} ; rm -fr config.cache autom4te*.cache) -(cd ${srcdir} ; aclocal -I config) -(cd ${srcdir} ; autoconf) -(cd ${srcdir} ; autoheader) -# (cd ${srcdir} ; libtoolize --automake) -(cd ${srcdir} ; automake --add-missing -Wno-portability) +aclocal -I config +autoconf +autoheader +# libtoolize --automake +automake --add-missing -Wno-portability diff --git a/volk/bootstrap b/volk/bootstrap index b11506750..a7fb78ac5 100755 --- a/volk/bootstrap +++ b/volk/bootstrap @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2001-2011 Free Software Foundation, Inc. +# Copyright 2001,2005,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -18,19 +18,14 @@ # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. +rm -fr config.cache autom4te*.cache -srcdir=$(cd $(dirname $0) ; pwd) -gendir=${srcdir}/gen +python -B gen/volk_register.py +mv gen/lib/Makefile.am lib/ -echo "Bootstrap'n volk... ${srcdir}" - -python -B ${srcdir}/gen/volk_register.py -mv ${gendir}/lib/Makefile.am ${srcdir}/lib/ - -(cd ${srcdir} ; rm -fr config.cache autom4te*.cache) -(cd ${srcdir} ; aclocal -I config -I ${gendir}/config) -(cd ${srcdir} ; autoconf) -(cd ${srcdir} ; autoheader) -(cd ${srcdir} ; libtoolize --automake) -(cd ${srcdir} ; automake --add-missing -Wno-portability -Wno-override -Wnone) +aclocal -I config -I gen/config +autoconf +autoheader +libtoolize --automake +automake --add-missing -Wno-portability -Wno-override -Wnone |