summaryrefslogtreecommitdiff
path: root/gr-usrp
diff options
context:
space:
mode:
authorTom Rondeau2011-04-04 22:22:58 -0400
committerTom Rondeau2011-04-04 22:22:58 -0400
commita43ea214e1ccf8dd8f4420198ecb67884d64de46 (patch)
tree696c985ac867549e2f535798f5ebe8fea8536ec6 /gr-usrp
parent2653d20527b9c8b431b9bfcd396bc2a03a8a950b (diff)
parenteca5501969aa6175562b7e70b350cf3e6ddec603 (diff)
downloadgnuradio-a43ea214e1ccf8dd8f4420198ecb67884d64de46.tar.gz
gnuradio-a43ea214e1ccf8dd8f4420198ecb67884d64de46.tar.bz2
gnuradio-a43ea214e1ccf8dd8f4420198ecb67884d64de46.zip
Merge branch 'master' into qtgui
Diffstat (limited to 'gr-usrp')
-rw-r--r--gr-usrp/apps/Makefile.am2
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)