25 files changed, 16 insertions, 20 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 \
diff --git a/gnuradio-examples/Makefile.am b/gnuradio-examples/Makefile.am
index e0c1b1d15..ded4e743d 100644
--- a/gnuradio-examples/Makefile.am
+++ b/gnuradio-examples/Makefile.am
@@ -21,7 +21,8 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = c++
+SUBDIRS =
+
 if PYTHON
 SUBDIRS += python grc
 endif
diff --git a/gnuradio-examples/c++/.gitignore b/gnuradio-examples/c++/.gitignore
deleted file mode 100644
index 19dd0e0a5..000000000
--- a/gnuradio-examples/c++/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/.deps
-/.libs
-/Makefile
-/Makefile.in
-/dialtone
diff --git a/gnuradio-examples/python/Makefile.am b/gnuradio-examples/python/Makefile.am
index ea03b438f..30effdf9a 100644
--- a/gnuradio-examples/python/Makefile.am
+++ b/gnuradio-examples/python/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2007,2009 Free Software Foundation, Inc.
+# Copyright 2004,2007,2009,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -23,7 +23,6 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS = \
 	apps \
-	audio \
 	digital \
 	digital-bert \
 	digital_voice \
diff --git a/gr-audio/Makefile.am b/gr-audio/Makefile.am
index bb0d05d07..cde1702f2 100644
--- a/gr-audio/Makefile.am
+++ b/gr-audio/Makefile.am
@@ -21,7 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = include lib
+SUBDIRS = include lib examples
 
 if PYTHON
 SUBDIRS += grc swig
diff --git a/gr-audio/examples/.gitignore b/gr-audio/examples/.gitignore
new file mode 100644
index 000000000..b336cc7ce
--- /dev/null
+++ b/gr-audio/examples/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/gnuradio-examples/c++/Makefile.am b/gr-audio/examples/Makefile.am
index 5a49e0e89..a2365d403 100644
--- a/gnuradio-examples/c++/Makefile.am
+++ b/gr-audio/examples/Makefile.am
@@ -20,4 +20,9 @@
 # 
 
 include $(top_srcdir)/Makefile.common
-SUBDIRS = audio
+
+SUBDIRS = c++
+
+if PYTHON
+SUBDIRS += python
+endif
diff --git a/gnuradio-examples/c++/audio/.gitignore b/gr-audio/examples/c++/.gitignore
index bb08aaf91..bb08aaf91 100644
--- a/gnuradio-examples/c++/audio/.gitignore
+++ b/gr-audio/examples/c++/.gitignore
diff --git a/gnuradio-examples/c++/audio/Makefile.am b/gr-audio/examples/c++/Makefile.am
index 88bd7c1fd..88bd7c1fd 100644
--- a/gnuradio-examples/c++/audio/Makefile.am
+++ b/gr-audio/examples/c++/Makefile.am
diff --git a/gnuradio-examples/c++/audio/dial_tone.cc b/gr-audio/examples/c++/dial_tone.cc
index e4e3d8ceb..e4e3d8ceb 100644
--- a/gnuradio-examples/c++/audio/dial_tone.cc
+++ b/gr-audio/examples/c++/dial_tone.cc
diff --git a/gnuradio-examples/python/audio/.gitignore b/gr-audio/examples/python/.gitignore
index c400497f5..b4813f3c8 100644
--- a/gnuradio-examples/python/audio/.gitignore
+++ b/gr-audio/examples/python/.gitignore
@@ -1,10 +1,4 @@
 /Makefile
 /Makefile.in
-/.la
-/.lo
-/.deps
-/.libs
-/*.la
-/*.lo
 /*.pyc
 /*.pyo
diff --git a/gnuradio-examples/python/audio/Makefile.am b/gr-audio/examples/python/Makefile.am
index 356b51559..356b51559 100644
--- a/gnuradio-examples/python/audio/Makefile.am
+++ b/gr-audio/examples/python/Makefile.am
diff --git a/gnuradio-examples/python/audio/audio_copy.py b/gr-audio/examples/python/audio_copy.py
index 3094c9f7a..3094c9f7a 100755
--- a/gnuradio-examples/python/audio/audio_copy.py
+++ b/gr-audio/examples/python/audio_copy.py
diff --git a/gnuradio-examples/python/audio/audio_fft.py b/gr-audio/examples/python/audio_fft.py
index 960e0f94d..960e0f94d 100755
--- a/gnuradio-examples/python/audio/audio_fft.py
+++ b/gr-audio/examples/python/audio_fft.py
diff --git a/gnuradio-examples/python/audio/audio_play.py b/gr-audio/examples/python/audio_play.py
index f9520c7cf..f9520c7cf 100755
--- a/gnuradio-examples/python/audio/audio_play.py
+++ b/gr-audio/examples/python/audio_play.py
diff --git a/gnuradio-examples/python/audio/audio_to_file.py b/gr-audio/examples/python/audio_to_file.py
index 0d54f7bd2..0d54f7bd2 100755
--- a/gnuradio-examples/python/audio/audio_to_file.py
+++ b/gr-audio/examples/python/audio_to_file.py
diff --git a/gnuradio-examples/python/audio/dial_tone.py b/gr-audio/examples/python/dial_tone.py
index 65c5e50b2..65c5e50b2 100755
--- a/gnuradio-examples/python/audio/dial_tone.py
+++ b/gr-audio/examples/python/dial_tone.py
diff --git a/gnuradio-examples/python/audio/dial_tone_daemon.py b/gr-audio/examples/python/dial_tone_daemon.py
index d30d0e117..d30d0e117 100755
--- a/gnuradio-examples/python/audio/dial_tone_daemon.py
+++ b/gr-audio/examples/python/dial_tone_daemon.py
diff --git a/gnuradio-examples/python/audio/dial_tone_wav.py b/gr-audio/examples/python/dial_tone_wav.py
index 6e87b2a48..6e87b2a48 100755
--- a/gnuradio-examples/python/audio/dial_tone_wav.py
+++ b/gr-audio/examples/python/dial_tone_wav.py
diff --git a/gnuradio-examples/python/audio/mono_tone.py b/gr-audio/examples/python/mono_tone.py
index 869c2e5ff..869c2e5ff 100755
--- a/gnuradio-examples/python/audio/mono_tone.py
+++ b/gr-audio/examples/python/mono_tone.py
diff --git a/gnuradio-examples/python/audio/multi_tone.py b/gr-audio/examples/python/multi_tone.py
index 7d47dd5d5..7d47dd5d5 100755
--- a/gnuradio-examples/python/audio/multi_tone.py
+++ b/gr-audio/examples/python/multi_tone.py
diff --git a/gnuradio-examples/python/audio/noise.py b/gr-audio/examples/python/noise.py
index 75f741082..75f741082 100755
--- a/gnuradio-examples/python/audio/noise.py
+++ b/gr-audio/examples/python/noise.py
diff --git a/gnuradio-examples/python/audio/spectrum_inversion.py b/gr-audio/examples/python/spectrum_inversion.py
index 021e23f2d..021e23f2d 100755
--- a/gnuradio-examples/python/audio/spectrum_inversion.py
+++ b/gr-audio/examples/python/spectrum_inversion.py
diff --git a/gnuradio-examples/python/audio/test_resampler.py b/gr-audio/examples/python/test_resampler.py
index 4644c5e2f..4644c5e2f 100755
--- a/gnuradio-examples/python/audio/test_resampler.py
+++ b/gr-audio/examples/python/test_resampler.py