diff options
| author | Tom Rondeau | 2011-01-04 12:04:00 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-01-04 12:04:00 -0500 |
| commit | f7ba4702a44213e3bc03c41ea0c4eb1f02f230c7 (patch) | |
| tree | 48148f9db0b47ee14e0e7eea82e174cf9c82ebf4 /config | |
| parent | 99c2b220675f3ca73ef5cf0a9ebe03706f813d61 (diff) | |
| parent | 66768f6ec30edbc2cf481e16b92a387b483dde6c (diff) | |
| download | gnuradio-f7ba4702a44213e3bc03c41ea0c4eb1f02f230c7.tar.gz gnuradio-f7ba4702a44213e3bc03c41ea0c4eb1f02f230c7.tar.bz2 gnuradio-f7ba4702a44213e3bc03c41ea0c4eb1f02f230c7.zip | |
Merge branch 'next' of gnuradio.org:gnuradio into next
Diffstat (limited to 'config')
| -rw-r--r-- | config/grc_gnuradio_core.m4 | 4 | ||||
| -rw-r--r-- | config/grc_gnuradio_examples.m4 | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4 index 4585b9ace..15086be0f 100644 --- a/config/grc_gnuradio_core.m4 +++ b/config/grc_gnuradio_core.m4 @@ -83,8 +83,7 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ gnuradio-core/src/gen_interpolator_taps/Makefile \ gnuradio-core/src/guile/Makefile \ gnuradio-core/src/guile/run_guile_tests \ - gnuradio-core/src/guile/gnuradio/scripts/gr-run-waveform \ - gnuradio-core/src/guile/example-waveforms/Makefile \ + gnuradio-core/src/guile/gr-run-waveform-script \ gnuradio-core/src/lib/Makefile \ gnuradio-core/src/lib/filter/Makefile \ gnuradio-core/src/lib/g72x/Makefile \ @@ -118,7 +117,6 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ [ chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests chmod +x gnuradio-core/src/guile/run_guile_tests - chmod +x gnuradio-core/src/guile/gnuradio/scripts/gr-run-waveform ]) ]) ]) diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4 index 4d6116c70..0aad0c0da 100644 --- a/config/grc_gnuradio_examples.m4 +++ b/config/grc_gnuradio_examples.m4 @@ -43,6 +43,7 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[ gnuradio-examples/python/pfb/Makefile \ gnuradio-examples/python/usrp/Makefile \ gnuradio-examples/python/usrp2/Makefile \ + gnuradio-examples/waveforms/Makefile \ ]) GRC_BUILD_CONDITIONAL(gnuradio-examples) |