From 0c2ee71b0917be6b663b4e7820d3e99643337964 Mon Sep 17 00:00:00 2001
From: Eric Blossom
Date: Tue, 30 Nov 2010 17:20:07 -0800
Subject: 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]
---
 bootstrap         | 3 +++
 usrp2/Makefile.am | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bootstrap b/bootstrap
index 7daff90d1..463ff165b 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 1ea058902..9813f38cb 100644
--- a/usrp2/Makefile.am
+++ b/usrp2/Makefile.am
@@ -20,4 +20,4 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = host
+SUBDIRS = host firmware
-- 
cgit