diff options
| author | Johnathan Corgan | 2011-03-16 08:18:30 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2011-03-16 08:18:30 -0700 |
| commit | 4cd06fadac972d4cac559c15488bc39823063afe (patch) | |
| tree | 6fe57896bc216d8c9e672194f2e4e0e75aedb645 /config/grc_gr_trellis.m4 | |
| parent | 4ad736e21f45f64fd616bb53f54e45e1c63e7330 (diff) | |
| parent | 1d70ed2bd928d52a383e688949cc7f747dd584fa (diff) | |
| download | gnuradio-4cd06fadac972d4cac559c15488bc39823063afe.tar.gz gnuradio-4cd06fadac972d4cac559c15488bc39823063afe.tar.bz2 gnuradio-4cd06fadac972d4cac559c15488bc39823063afe.zip | |
Merge remote branch 'gnuradio/next'
* gnuradio/next: (806 commits)
gruel: added missing ignores
gruel: fixed swig interface file to dereference pmt_t.
qtgui: fix distcheck error
gruel: fixing structure. Passes make check.
gruel: SWIGing Gruel into Python to access PMTs.
gnuradio-examples: add C++ audio examples using new gr-audio
created gruel/attributes.h to house compiler specific attribute macros
audio: remove obsoleted individual top-level components
gr-audio: added README and default config fix
volk: simplify the get new method for the aligned pool
grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grc
grc: swap store the subprocess object rather than the pid when executing
qtgui: removed python directory that was added, never used
uhd: use %ignore to hide warnings and fix errors
Added/updated ignore files.
Fixing gr_filter_design program to import from gnuradio Python package.
audio: high prio for platform specific audio osx
audio: added windows and osx audio source files
audio: added config checks for other audios, added jack and port
audio: make prefs look like old audio, removed old audio.py
...
Diffstat (limited to 'config/grc_gr_trellis.m4')
| -rw-r--r-- | config/grc_gr_trellis.m4 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config/grc_gr_trellis.m4 b/config/grc_gr_trellis.m4 index cb51325d6..bc9ca6f49 100644 --- a/config/grc_gr_trellis.m4 +++ b/config/grc_gr_trellis.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2010 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -29,6 +29,7 @@ AC_DEFUN([GRC_GR_TRELLIS],[ gr-trellis/doc/Makefile \ gr-trellis/src/Makefile \ gr-trellis/src/lib/Makefile \ + gr-trellis/src/lib/run_guile_tests \ gr-trellis/src/python/Makefile \ gr-trellis/src/python/run_tests \ gr-trellis/src/examples/Makefile \ @@ -37,6 +38,8 @@ AC_DEFUN([GRC_GR_TRELLIS],[ GRC_BUILD_CONDITIONAL(gr-trellis,[ dnl run_tests is created from run_tests.in. Make it executable. - AC_CONFIG_COMMANDS([run_tests_gr_trellis], [chmod +x gr-trellis/src/python/run_tests]) + AC_CONFIG_COMMANDS([run_tests_gr_trellis], + [chmod +x gr-trellis/src/python/run_tests; + chmod +x gr-trellis/src/lib/run_guile_tests]) ]) ]) |