Imported Upstream version 3.2.2

[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 6dbeb7c739f40b2aa83f930fe2dffd9085a5d18f..fcb4d4ea5b1a574416b790178c5e9e7767616cf5 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 g72x reed-solomon omnithread io . swig
+SUBDIRS = missing runtime filter viterbi general gengen g72x reed-solomon io hier . swig
 
 # generate libgnuradio-core.la from the convenience libraries in subdirs
 
@@ -35,22 +35,29 @@ 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             \
        g72x/libccitt.la                \
+       viterbi/libviterbi.la           \
        general/libgeneral.la           \
+       gengen/libgengen.la             \
        io/libio.la                     \
        missing/libmissing.la           \
-       omnithread/libomnithread.la     \
        reed-solomon/librs.la           \
        runtime/libruntime.la           \
-       $(FFTW3F_LIBS)
+       hier/libhier.la                 \
+       $(OMNITHREAD_LA)                \
+       $(GRUEL_LA)                     \
+       $(FFTW3F_LIBS)                  \
+       $(GSL_LIBS)                     \
+       $(CBLAS_LIBS)                   
 
 libgnuradio_core_qa_la_LIBADD  =       \
        filter/libfilter-qa.la          \
        general/libgeneral-qa.la        \
        runtime/libruntime-qa.la        \
-       missing/libmissing.la           \
        libgnuradio-core.la             \
        $(CPPUNIT_LIBS)