From a5e2d9e5baf869ae961fbb5820447290d6d9c7c8 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 26 Apr 2011 21:55:48 -0700
Subject: volk: reorganization of generation sources and generated files

All generation sources have been moved to the gen/ subdirectory.
Bootstrap and volk_register.py generate the files into to gen/ subdirectory
in an effort to cleanly separate the static/generated parts of the build tree.

Define top_gendir in Makefile.common, all generated sources listed in Makefile.ams
are prefixed with $(top_gendir) to differentiate them from static in-tree sources.
---
 volk/bootstrap | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'volk/bootstrap')

diff --git a/volk/bootstrap b/volk/bootstrap
index ff239c88c..a7fb78ac5 100755
--- a/volk/bootstrap
+++ b/volk/bootstrap
@@ -20,8 +20,10 @@
 # Boston, MA 02110-1301, USA.
 rm -fr config.cache autom4te*.cache
 
-cd include/volk && chmod +x volk_register.py && ./volk_register.py && cd ../..
-aclocal -I config
+python -B gen/volk_register.py
+mv gen/lib/Makefile.am lib/
+
+aclocal -I config -I gen/config
 autoconf
 autoheader
 libtoolize --automake
-- 
cgit 


From 42783746a78bf4d094e6ff9b6971b565e9ac59dd Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Tue, 26 Apr 2011 22:59:13 -0700
Subject: gnuradio: support out-of-tree bootstrap

Run bootstrap from any directory and it will work.
The bootstrap script determines the source directory,
and cds into that directory to run each auto* command.

The bootstrap files also print that they are run,
and there is a place to add-in future sub-projects.
---
 volk/bootstrap | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'volk/bootstrap')

diff --git a/volk/bootstrap b/volk/bootstrap
index a7fb78ac5..b11506750 100755
--- a/volk/bootstrap
+++ b/volk/bootstrap
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2001,2005,2008 Free Software Foundation, Inc.
+# Copyright 2001-2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -18,14 +18,19 @@
 # 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
 
-python -B gen/volk_register.py
-mv gen/lib/Makefile.am lib/
+srcdir=$(cd $(dirname $0) ; pwd)
+gendir=${srcdir}/gen
 
-aclocal -I config -I gen/config
-autoconf
-autoheader
-libtoolize --automake
-automake --add-missing -Wno-portability -Wno-override -Wnone
+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)
 
-- 
cgit 


From b3a85a74862636a2168d028f3e1bbdb07107edc8 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 9 May 2011 10:45:28 -0700
Subject: gnuradio: revert bootstrap changes

Its so simple, but seems to not work well on some machines.
---
 volk/bootstrap | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

(limited to 'volk/bootstrap')

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
 
-- 
cgit