diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-10-16 22:14:29 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-10-16 22:14:29 -0400 |
| commit | a4dbd973fc6376bacf3c45e63aba61a471c468b3 (patch) | |
| tree | 60b19871647430da19e7303b1394af50742d48dc /gr-usrp | |
| parent | e0fdd93625a6234ba0d9cabf6e6abfc4df9a2ec6 (diff) | |
| parent | 2d5a6f86fd3047748a9f816548e2901b02838734 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-qtgui/lib/Makefile.am
Diffstat (limited to 'gr-usrp')
| -rw-r--r-- | gr-usrp/apps/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gr-usrp/apps/Makefile.am b/gr-usrp/apps/Makefile.am index d014b7c75d..b45f3f79c5 100644 --- a/gr-usrp/apps/Makefile.am +++ b/gr-usrp/apps/Makefile.am @@ -37,7 +37,8 @@ LDADD = \ $(USRP_LA) \ $(GR_USRP_LA) \ $(BOOST_LDFLAGS) \ - $(BOOST_PROGRAM_OPTIONS_LIB) + $(BOOST_PROGRAM_OPTIONS_LIB) \ + $(BOOST_FILESYSTEM_LIB) noinst_PROGRAMS = \ usrp_rx_cfile \ |