diff options
| author | Tom Rondeau | 2011-03-20 12:31:10 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-03-20 12:31:10 -0400 |
| commit | 972fc99ad6984e50731ec0dd97ccfec71829139b (patch) | |
| tree | dcbbe06ca254169c122b88600816e504643880dc /gnuradio-core/src/lib/Makefile.am | |
| parent | 3c3aff088447942053e96ae30b766b00d4cd0202 (diff) | |
| parent | 4d1426b8db5be20583a6efb380d564a55a28fd09 (diff) | |
| download | gnuradio-972fc99ad6984e50731ec0dd97ccfec71829139b.tar.gz gnuradio-972fc99ad6984e50731ec0dd97ccfec71829139b.tar.bz2 gnuradio-972fc99ad6984e50731ec0dd97ccfec71829139b.zip | |
Merge branch 'master' of gnuradio.org:gnuradio
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) |