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 /gr-msdd6000/src/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 'gr-msdd6000/src/Makefile.am')
-rw-r--r-- | gr-msdd6000/src/Makefile.am | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/gr-msdd6000/src/Makefile.am b/gr-msdd6000/src/Makefile.am index f6dbd2fb8..91173702f 100644 --- a/gr-msdd6000/src/Makefile.am +++ b/gr-msdd6000/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007,2008,2009 Free Software Foundation, Inc. +# Copyright 2007,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,6 +20,8 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig + AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ $(WITH_INCLUDES) @@ -42,9 +44,8 @@ libgnuradio_msdd6000_la_SOURCES = \ msdd_source_simple.cc \ msdd6000.cc - libgnuradio_msdd6000_rs_la_SOURCES = \ - msdd_rs_source_simple.cc \ + msdd_rs_source_simple.cc \ msdd6000_rs.cc libgnuradio_msdd6000_la_LIBADD = \ @@ -54,9 +55,8 @@ libgnuradio_msdd6000_rs_la_LIBADD = \ $(GNURADIO_CORE_LA) -if PYTHON ################################# -# SWIG interface and library +# SWIG interfaces and libraries TOP_SWIG_IFILES = \ msdd.i msdd_rs.i @@ -77,12 +77,3 @@ msdd_la_swig_libadd = \ msdd_rs_la_swig_libadd = \ libgnuradio-msdd6000_rs.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 |