diff options
| author | Tom Rondeau | 2011-06-05 15:36:47 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-06-05 15:36:47 -0400 |
| commit | 233f960474f86bc8cc519ce7257b29d8615c4000 (patch) | |
| tree | 1a4c846119a01a5a195a9e9ee5b854384b0b6535 /gnuradio-core/src/lib/Makefile.am | |
| parent | 024c79a7fb13c08bae7b97079a245f711ecf12a7 (diff) | |
| parent | a23a0a46c3bf446cbe09d71bc8e10b061256ef56 (diff) | |
| download | gnuradio-233f960474f86bc8cc519ce7257b29d8615c4000.tar.gz gnuradio-233f960474f86bc8cc519ce7257b29d8615c4000.tar.bz2 gnuradio-233f960474f86bc8cc519ce7257b29d8615c4000.zip | |
Merge branch 'master' into turbo
Diffstat (limited to 'gnuradio-core/src/lib/Makefile.am')
| -rw-r--r-- | gnuradio-core/src/lib/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am index f3a3accdb..4db2ff167 100644 --- a/gnuradio-core/src/lib/Makefile.am +++ b/gnuradio-core/src/lib/Makefile.am @@ -24,10 +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 viterbi general gengen g72x reed-solomon io hier . -if PYTHON -SUBDIRS += swig -endif +SUBDIRS = missing runtime filter viterbi general gengen g72x reed-solomon io hier . swig AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) @@ -69,4 +66,7 @@ libgnuradio_core_qa_la_LIBADD = \ bin_PROGRAMS = gnuradio-config-info gnuradio_config_info_SOURCES = gnuradio-config-info.cc -gnuradio_config_info_LDADD = libgnuradio-core.la $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) +gnuradio_config_info_LDADD = libgnuradio-core.la \ + $(BOOST_LDFLAGS) \ + $(BOOST_PROGRAM_OPTIONS_LIB) \ + $(BOOST_FILESYSTEM_LIB) |