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 /gr-gsm-fr-vocoder/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 'gr-gsm-fr-vocoder/src/lib/Makefile.am')
| -rw-r--r-- | gr-gsm-fr-vocoder/src/lib/Makefile.am | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am index 97d6fc306..4ce65bc31 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.am +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2008,2009 Free Software Foundation, Inc. +# Copyright 2004,2005,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,6 +20,7 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig SUBDIRS = gsm . @@ -42,7 +43,7 @@ libgnuradio_gsm_fr_vocoder_la_LIBADD = \ libgnuradio_gsm_fr_vocoder_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) -if PYTHON + # SWIG interface and library TOP_SWIG_IFILES = \ gsm_full_rate.i @@ -58,11 +59,3 @@ gsm_full_rate_pythondir_category = \ gsm_full_rate_la_swig_libadd = \ libgnuradio-gsm-fr-vocoder.la -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) -endif |