summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blossom <eb@comsec.com>2010-11-30 17:20:07 -0800
committerEric Blossom <eb@comsec.com>2010-11-30 17:20:07 -0800
commit0c2ee71b0917be6b663b4e7820d3e99643337964 (patch)
treee78d0d3a13a1d30c7d762812e6dda7e798bd9d7e
parent82f2222a58e83971308c9caaaae026f396b3e9fe (diff)
Revert "Removed usrp2-firmware from being automatically built."
This reverts commit 3bb029afe0d7de1bd4aadaecf4eb7121e0f2c84d. The change reverted removed the usrp2/firmware from the distribution tarballs and also had configure report that it was building the usrp2 firmware when in fact it wasn't. What is the problem that you are trying to solve? Example of configure output that lies: config.status: creating config/Makefile config.status: creating config.h config.status: executing depfiles commands ********************************************************************* The following GNU Radio components have been successfully configured: usrp2-firmware You my now run the make command to build these components. ********************************************************************* The following GNU Radio components have been successfully configured: config gruel gnuradio-core usrp usrp2 [snip]
-rwxr-xr-xbootstrap3
-rw-r--r--usrp2/Makefile.am2
2 files changed, 4 insertions, 1 deletions
diff --git a/bootstrap b/bootstrap
index 7daff90d1b..463ff165b2 100755
--- a/bootstrap
+++ b/bootstrap
@@ -28,3 +28,6 @@ autoheader
libtoolize --automake
automake --add-missing -Wno-portability -Wno-override -Wnone
#automake --add-missing -Wno-portability
+
+# Run bootstrap in any subprojects
+(cd usrp2/firmware ; ./bootstrap)
diff --git a/usrp2/Makefile.am b/usrp2/Makefile.am
index 1ea058902c..9813f38cba 100644
--- a/usrp2/Makefile.am
+++ b/usrp2/Makefile.am
@@ -20,4 +20,4 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS = host
+SUBDIRS = host firmware