diff options
author | Tom Rondeau | 2011-05-08 11:54:44 -0400 |
---|---|---|
committer | Tom Rondeau | 2011-05-08 11:54:44 -0400 |
commit | cbf76b863bfd62ca22913b84bc705908a817b664 (patch) | |
tree | 3a2692c067a60487b965201f1ed4a92ca26f0816 /gruel/src/lib | |
parent | 918d53d764736fe2be79e1a6e08aba7d2e75f56d (diff) | |
parent | 6c3623b0b084ce9328557ebd3cd487c484ee1c5b (diff) | |
download | gnuradio-cbf76b863bfd62ca22913b84bc705908a817b664.tar.gz gnuradio-cbf76b863bfd62ca22913b84bc705908a817b664.tar.bz2 gnuradio-cbf76b863bfd62ca22913b84bc705908a817b664.zip |
Merge branch '8psk' of github.com:trondeau/gnuradio into 8psk
Conflicts:
gr-digital/lib/digital_costas_loop_cc.cc
gr-digital/python/qa_costas_loop_cc.py
Diffstat (limited to 'gruel/src/lib')
-rw-r--r-- | gruel/src/lib/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gruel/src/lib/Makefile.am b/gruel/src/lib/Makefile.am index f37ab27a1..773f3aefd 100644 --- a/gruel/src/lib/Makefile.am +++ b/gruel/src/lib/Makefile.am @@ -60,5 +60,9 @@ libgruel_la_LIBADD = \ # ---------------------------------------------------------------- test_gruel_SOURCES = test_gruel.cc -test_gruel_LDADD = pmt/libpmt-qa.la libgruel.la +test_gruel_LDADD = \ + $(BOOST_THREAD_LIB) \ + $(BOOST_SYSTEM_LIB) \ + $(BOOST_FILESYSTEM_LIB) \ + pmt/libpmt-qa.la libgruel.la |