summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreb2008-10-04 17:21:28 +0000
committereb2008-10-04 17:21:28 +0000
commitdaeac31043577697056aa78dbbf131700c67ed13 (patch)
tree1274986d5ba002fa9cac81ce731b53b36652bcee
parent94981131edbe7bb7cc4261d73de0d476f386b6fa (diff)
downloadgnuradio-daeac31043577697056aa78dbbf131700c67ed13.tar.gz
gnuradio-daeac31043577697056aa78dbbf131700c67ed13.tar.bz2
gnuradio-daeac31043577697056aa78dbbf131700c67ed13.zip
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. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9709 221aa14e-8319-0410-a670-987f0aec2ac5
-rw-r--r--Makefile.am4
-rw-r--r--usrp2/Makefile.am2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index b5d4f9455..9262c5bcc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,5 +32,5 @@ EXTRA_DIST = \
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@
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