diff options
author | Tom Rondeau | 2011-10-16 22:14:29 -0400 |
---|---|---|
committer | Tom Rondeau | 2011-10-16 22:14:29 -0400 |
commit | a4dbd973fc6376bacf3c45e63aba61a471c468b3 (patch) | |
tree | 60b19871647430da19e7303b1394af50742d48dc /gr-audio | |
parent | e0fdd93625a6234ba0d9cabf6e6abfc4df9a2ec6 (diff) | |
parent | 2d5a6f86fd3047748a9f816548e2901b02838734 (diff) | |
download | gnuradio-a4dbd973fc6376bacf3c45e63aba61a471c468b3.tar.gz gnuradio-a4dbd973fc6376bacf3c45e63aba61a471c468b3.tar.bz2 gnuradio-a4dbd973fc6376bacf3c45e63aba61a471c468b3.zip |
Merge branch 'master' into next
Conflicts:
gr-qtgui/lib/Makefile.am
Diffstat (limited to 'gr-audio')
-rw-r--r-- | gr-audio/examples/c++/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gr-audio/examples/c++/Makefile.am b/gr-audio/examples/c++/Makefile.am index 88bd7c1fd..d3283354f 100644 --- a/gr-audio/examples/c++/Makefile.am +++ b/gr-audio/examples/c++/Makefile.am @@ -35,4 +35,6 @@ GR_AUDIO_LA=$(top_builddir)/gr-audio/lib/libgnuradio-audio.la noinst_PROGRAMS = dial_tone dial_tone_SOURCES = dial_tone.cc -dial_tone_LDADD = $(GNURADIO_CORE_LA) $(GR_AUDIO_LA) +dial_tone_LDADD = \ + $(GNURADIO_CORE_LA) $(GR_AUDIO_LA) \ + $(BOOST_FILESYSTEM_LIB) |