diff options
| author | Johnathan Corgan | 2011-07-04 21:07:29 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2011-07-04 21:07:29 -0700 |
| commit | ec4c3c3c2893b9f068ca11ad623a77d9b12f60a8 (patch) | |
| tree | 1eb2c48fdcba9c6734403a42fdafb7055f799dc2 /config | |
| parent | 0ff8efadfbd68def82b360db461ae9adb52f176f (diff) | |
| parent | b7d8980a6e9e070609b4270ad51d8a91ebfb60b2 (diff) | |
| download | gnuradio-ec4c3c3c2893b9f068ca11ad623a77d9b12f60a8.tar.gz gnuradio-ec4c3c3c2893b9f068ca11ad623a77d9b12f60a8.tar.bz2 gnuradio-ec4c3c3c2893b9f068ca11ad623a77d9b12f60a8.zip | |
Merge branch 'master' into next
Diffstat (limited to 'config')
| -rw-r--r-- | config/grc_gnuradio_examples.m4 | 5 | ||||
| -rw-r--r-- | config/grc_gr_audio.m4 | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4 index 203f39d0d..6dff01943 100644 --- a/config/grc_gnuradio_examples.m4 +++ b/config/grc_gnuradio_examples.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009,2011 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -26,14 +26,11 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[ AC_CONFIG_FILES([ \ gnuradio-examples/Makefile \ - gnuradio-examples/c++/Makefile \ - gnuradio-examples/c++/audio/Makefile \ gnuradio-examples/python/Makefile \ gnuradio-examples/grc/Makefile \ gnuradio-examples/python/apps/hf_explorer/Makefile \ gnuradio-examples/python/apps/hf_radio/Makefile \ gnuradio-examples/python/apps/Makefile \ - gnuradio-examples/python/audio/Makefile \ gnuradio-examples/python/digital/Makefile \ gnuradio-examples/python/digital_voice/Makefile \ gnuradio-examples/python/digital-bert/Makefile \ diff --git a/config/grc_gr_audio.m4 b/config/grc_gr_audio.m4 index bcb19be35..92a0440d0 100644 --- a/config/grc_gr_audio.m4 +++ b/config/grc_gr_audio.m4 @@ -101,6 +101,9 @@ AC_DEFUN([GRC_GR_AUDIO],[ AC_CONFIG_FILES([ \ gr-audio/Makefile \ + gr-audio/examples/Makefile \ + gr-audio/examples/c++/Makefile \ + gr-audio/examples/python/Makefile \ gr-audio/grc/Makefile \ gr-audio/include/Makefile \ gr-audio/lib/Makefile \ |