Merged eb/omni -r4315:4327 into trunk.

[debian/gnuradio] / gnuradio-core / src / lib / Makefile.am

diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am
index 96a8917006ad61a9167c670ffba3c08103009f3e..70a4de08ec061a6998cf73b399962e3257146745 100644 (file)
--- a/gnuradio-core/src/lib/Makefile.am
+++ b/gnuradio-core/src/lib/Makefile.am
@@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.common
 ## Process this file with automake to produce Makefile.in
 
 # We've got to build . before swig
-SUBDIRS = missing runtime filter general gengen g72x reed-solomon omnithread io . swig
+SUBDIRS = missing runtime filter general gengen g72x reed-solomon io . swig
 
 # generate libgnuradio-core.la from the convenience libraries in subdirs
 
@@ -35,7 +35,7 @@ libgnuradio_core_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
 
 libgnuradio_core_qa_la_SOURCES = bug_work_around_6.cc
 libgnuradio_core_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 \
-                               $(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
+                                $(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
 
 libgnuradio_core_la_LIBADD  =          \
        filter/libfilter.la             \
@@ -44,9 +44,9 @@ libgnuradio_core_la_LIBADD  =                 \
        gengen/libgengen.la             \
        io/libio.la                     \
        missing/libmissing.la           \
-       omnithread/libomnithread.la     \
        reed-solomon/librs.la           \
        runtime/libruntime.la           \
+       $(OMNITHREAD_LIBS)              \
        $(FFTW3F_LIBS)
 
 libgnuradio_core_qa_la_LIBADD  =       \