diff options
author | Tom Rondeau | 2011-06-05 15:36:47 -0400 |
---|---|---|
committer | Tom Rondeau | 2011-06-05 15:36:47 -0400 |
commit | 233f960474f86bc8cc519ce7257b29d8615c4000 (patch) | |
tree | 1a4c846119a01a5a195a9e9ee5b854384b0b6535 /gr-usrp/apps/Makefile.am | |
parent | 024c79a7fb13c08bae7b97079a245f711ecf12a7 (diff) | |
parent | a23a0a46c3bf446cbe09d71bc8e10b061256ef56 (diff) | |
download | gnuradio-233f960474f86bc8cc519ce7257b29d8615c4000.tar.gz gnuradio-233f960474f86bc8cc519ce7257b29d8615c4000.tar.bz2 gnuradio-233f960474f86bc8cc519ce7257b29d8615c4000.zip |
Merge branch 'master' into turbo
Diffstat (limited to 'gr-usrp/apps/Makefile.am')
-rw-r--r-- | gr-usrp/apps/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gr-usrp/apps/Makefile.am b/gr-usrp/apps/Makefile.am index 0f3a21bb4..c3955ad9d 100644 --- a/gr-usrp/apps/Makefile.am +++ b/gr-usrp/apps/Makefile.am @@ -33,6 +33,8 @@ GR_USRP_LA=$(top_builddir)/gr-usrp/src/libgnuradio-usrp.la # For compiling outside the tree, these will get fished out by pkgconfig LDADD = \ + $(GNURADIO_CORE_LA) \ + $(USRP_LA) \ $(GR_USRP_LA) \ $(BOOST_LDFLAGS) \ $(BOOST_PROGRAM_OPTIONS_LIB) |