diff options
| author | Tom Rondeau | 2011-05-08 11:54:44 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-05-08 11:54:44 -0400 |
| commit | cbf76b863bfd62ca22913b84bc705908a817b664 (patch) | |
| tree | 3a2692c067a60487b965201f1ed4a92ca26f0816 /gruel/src/swig/Makefile.am | |
| parent | 918d53d764736fe2be79e1a6e08aba7d2e75f56d (diff) | |
| parent | 6c3623b0b084ce9328557ebd3cd487c484ee1c5b (diff) | |
| download | gnuradio-cbf76b863bfd62ca22913b84bc705908a817b664.tar.gz gnuradio-cbf76b863bfd62ca22913b84bc705908a817b664.tar.bz2 gnuradio-cbf76b863bfd62ca22913b84bc705908a817b664.zip | |
Merge branch '8psk' of github.com:trondeau/gnuradio into 8psk
Conflicts:
gr-digital/lib/digital_costas_loop_cc.cc
gr-digital/python/qa_costas_loop_cc.py
Diffstat (limited to 'gruel/src/swig/Makefile.am')
| -rw-r--r-- | gruel/src/swig/Makefile.am | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gruel/src/swig/Makefile.am b/gruel/src/swig/Makefile.am index 294045567..3261e47c2 100644 --- a/gruel/src/swig/Makefile.am +++ b/gruel/src/swig/Makefile.am @@ -30,9 +30,6 @@ AM_CPPFLAGS = \ $(PYTHON_CPPFLAGS) \ $(WITH_INCLUDES) -TOP_SWIG_IFILES = \ - pmt_swig.i - ############################## # SWIG interface and library TOP_SWIG_IFILES = \ @@ -50,6 +47,6 @@ pmt_swig_la_swig_libadd = \ $(abs_top_builddir)/gruel/src/lib/pmt/libpmt.la # additional SWIG files to be installed -pmt_swig_swiginclude_headers = - +pmt_swig_swiginclude_headers = \ + gr_intrusive_ptr.i |