From: jcorgan Date: Sat, 25 Jul 2009 18:06:44 +0000 (+0000) Subject: Update omnithread linking. X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=970d850297cf945943528557127db2cd327c3f3c;hp=4b4da4852482546157abbf8589f2a85bac6c3509;p=debian%2Fgnuradio Update omnithread linking. Moved link against omnithread from gnuradio-core to those components still using it (and were depending on pulling omnithread in that way). git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11488 221aa14e-8319-0410-a670-987f0aec2ac5 --- diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am index b3b42b03..477ba672 100644 --- a/gnuradio-core/src/lib/Makefile.am +++ b/gnuradio-core/src/lib/Makefile.am @@ -54,7 +54,6 @@ libgnuradio_core_la_LIBADD = \ reed-solomon/librs.la \ runtime/libruntime.la \ hier/libhier.la \ - $(OMNITHREAD_LA) \ $(GRUEL_LA) \ $(FFTW3F_LIBS) \ $(GSL_LIBS) \ diff --git a/gr-audio-osx/src/Makefile.am b/gr-audio-osx/src/Makefile.am index c50057f0..6099dc20 100644 --- a/gr-audio-osx/src/Makefile.am +++ b/gr-audio-osx/src/Makefile.am @@ -46,7 +46,8 @@ libgnuradio_audio_osx_la_SOURCES = \ audio_osx_source.cc libgnuradio_audio_osx_la_LIBADD = \ - $(GNURADIO_CORE_LA) + $(GNURADIO_CORE_LA) \ + $(OMNITHREAD_LA) libgnuradio_audio_osx_la_LDFLAGS = \ -framework AudioUnit \ diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am index 1df6bbce..20213d16 100644 --- a/gr-audio-portaudio/src/Makefile.am +++ b/gr-audio-portaudio/src/Makefile.am @@ -46,6 +46,7 @@ libgnuradio_audio_portaudio_la_SOURCES = \ libgnuradio_audio_portaudio_la_LIBADD = \ $(GNURADIO_CORE_LA) \ + $(OMNITHREAD_LA) \ $(PORTAUDIO_LIBS) libgnuradio_audio_portaudio_la_LDFLAGS = \