diff options
| author | Tom Rondeau | 2011-10-16 22:14:29 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-16 22:14:29 -0400 |
| commit | a4dbd973fc6376bacf3c45e63aba61a471c468b3 (patch) | |
| tree | 60b19871647430da19e7303b1394af50742d48dc /gnuradio-core/src/lib | |
| parent | e0fdd93625a6234ba0d9cabf6e6abfc4df9a2ec6 (diff) | |
| parent | 2d5a6f86fd3047748a9f816548e2901b02838734 (diff) | |
| download | gnuradio-a4dbd973fc6376bacf3c45e63aba61a471c468b3.tar.gz gnuradio-a4dbd973fc6376bacf3c45e63aba61a471c468b3.tar.bz2 gnuradio-a4dbd973fc6376bacf3c45e63aba61a471c468b3.zip | |
Merge branch 'master' into next
Conflicts:
gr-qtgui/lib/Makefile.am
Diffstat (limited to 'gnuradio-core/src/lib')
| -rw-r--r-- | gnuradio-core/src/lib/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am index 979ac7f91..fc1b7917b 100644 --- a/gnuradio-core/src/lib/Makefile.am +++ b/gnuradio-core/src/lib/Makefile.am @@ -1,4 +1,3 @@ -# # Copyright 2001,2004,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio @@ -54,7 +53,8 @@ libgnuradio_core_la_LIBADD = \ $(GRUEL_LA) \ $(FFTW3F_LIBS) \ $(GSL_LIBS) \ - $(CBLAS_LIBS) + $(CBLAS_LIBS) \ + $(BOOST_FILESYSTEM_LIB) libgnuradio_core_qa_la_LIBADD = \ filter/libfilter-qa.la \ |