X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gnuradio-core%2Fsrc%2Flib%2FMakefile.am;h=fcb4d4ea5b1a574416b790178c5e9e7767616cf5;hb=ea29b08aeb54227e6628f655ccfdb96fe4d8c378;hp=05461a05c1c80f8127fdeb49d932e4bbdfbc5139;hpb=18a684bf3dc144c48fc4cc6cc72f5070febd8074;p=debian%2Fgnuradio

diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am
index 05461a05..fcb4d4ea 100644
--- a/gnuradio-core/src/lib/Makefile.am
+++ b/gnuradio-core/src/lib/Makefile.am
@@ -5,7 +5,7 @@
 # 
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 # 
 # GNU Radio is distributed in the hope that it will be useful,
@@ -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,23 +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)