summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjcorgan2009-07-25 18:06:44 +0000
committerjcorgan2009-07-25 18:06:44 +0000
commit970d850297cf945943528557127db2cd327c3f3c (patch)
treee52f1a0c5b086ae418c44b6ccff99111df1fa1ac
parent4b4da4852482546157abbf8589f2a85bac6c3509 (diff)
downloadgnuradio-970d850297cf945943528557127db2cd327c3f3c.tar.gz
gnuradio-970d850297cf945943528557127db2cd327c3f3c.tar.bz2
gnuradio-970d850297cf945943528557127db2cd327c3f3c.zip
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
-rw-r--r--gnuradio-core/src/lib/Makefile.am1
-rw-r--r--gr-audio-osx/src/Makefile.am3
-rw-r--r--gr-audio-portaudio/src/Makefile.am1
3 files changed, 3 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am
index b3b42b03f..477ba6725 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 c50057f0f..6099dc20b 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 1df6bbcea..20213d16b 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 = \