[Commit-gnuradio] r9709 - in gnuradio/trunk: . usrp2

[eb]

Author: eb
Date: 2008-10-04 11:21:28 -0600 (Sat, 04 Oct 2008)
New Revision: 9709

Modified:
   gnuradio/trunk/Makefile.am
   gnuradio/trunk/usrp2/Makefile.am
Log:
Refactored how the usrp2/firmware connects into the top-level built.
We now have "normal" behavior.  That is, if your current directory is
usrp2, when you invoke "make" it will make both the host and firmware
directories. 



Modified: gnuradio/trunk/Makefile.am
===================================================================
--- gnuradio/trunk/Makefile.am  2008-10-04 01:29:47 UTC (rev 9708)
+++ gnuradio/trunk/Makefile.am  2008-10-04 17:21:28 UTC (rev 9709)
@@ -32,5 +32,5 @@
        README.hacking \
        README.building-boost
 
-SUBDIRS = @build_dirs@ $(subdirs)
-DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ @with_dirs@ $(subdirs)
+SUBDIRS = @build_dirs@
+DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ @with_dirs@

Modified: gnuradio/trunk/usrp2/Makefile.am
===================================================================
--- gnuradio/trunk/usrp2/Makefile.am    2008-10-04 01:29:47 UTC (rev 9708)
+++ gnuradio/trunk/usrp2/Makefile.am    2008-10-04 17:21:28 UTC (rev 9709)
@@ -20,4 +20,4 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = host
+SUBDIRS = host firmware