diff options
| author | Tom Rondeau | 2011-04-08 15:37:29 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-04-08 15:37:29 -0400 |
| commit | 21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb (patch) | |
| tree | 4e72909a051b0a4ac428252d15f34b53bcc986b6 /gruel/src/lib/Makefile.am | |
| parent | d7093fd06d0ec37f6ba2841d202fe90f4fa3661e (diff) | |
| parent | 5c358afd00347f5da7a59dd73ea79cd3df26659d (diff) | |
| download | gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.tar.gz gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.tar.bz2 gnuradio-21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb.zip | |
Merge branch 'master' into constell_obj
Conflicts:
gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
gr-audio-oss/src/Makefile.swig.gen
gr-audio/swig/Makefile.swig.gen
Diffstat (limited to 'gruel/src/lib/Makefile.am')
| -rw-r--r-- | gruel/src/lib/Makefile.am | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gruel/src/lib/Makefile.am b/gruel/src/lib/Makefile.am index b9b35ae10..773f3aefd 100644 --- a/gruel/src/lib/Makefile.am +++ b/gruel/src/lib/Makefile.am @@ -45,7 +45,6 @@ MSG_LIB = msg/libmsg.la libgruel_la_SOURCES = \ realtime.cc \ sys_pri.cc \ - thread.cc \ thread_body_wrapper.cc \ thread_group.cc @@ -61,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 |