moved grc examples to gnuradio-examples/grc

30 files changed, 10 insertions, 10 deletions

diff --git a/config/grc_gnuradio_examples.m4 b/config/grc_gnuradio_examples.m4
index 3225f3ab5..685761ff3 100644
--- a/config/grc_gnuradio_examples.m4
+++ b/config/grc_gnuradio_examples.m4
@@ -25,15 +25,16 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[
 
     AC_CONFIG_FILES([ \
         gnuradio-examples/Makefile \
-	gnuradio-examples/c++/Makefile \
-	gnuradio-examples/python/Makefile \
-	gnuradio-examples/python/apps/hf_explorer/Makefile \
+    gnuradio-examples/c++/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 \
+    gnuradio-examples/python/digital-bert/Makefile \
    	gnuradio-examples/python/mp-sched/Makefile \
    	gnuradio-examples/python/multi-antenna/Makefile \
    	gnuradio-examples/python/multi_usrp/Makefile \
@@ -41,7 +42,7 @@ AC_DEFUN([GRC_GNURADIO_EXAMPLES],[
    	gnuradio-examples/python/ofdm/Makefile \
    	gnuradio-examples/python/pfb/Makefile \
    	gnuradio-examples/python/usrp/Makefile \
-	gnuradio-examples/python/usrp2/Makefile \
+    gnuradio-examples/python/usrp2/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(gnuradio-examples)
diff --git a/config/grc_grc.m4 b/config/grc_grc.m4
index 7ee009fae..16720b8fe 100644
--- a/config/grc_grc.m4
+++ b/config/grc_grc.m4
@@ -50,7 +50,6 @@ AC_DEFUN([GRC_GRC],[
         grc/Makefile \
         grc/base/Makefile \
         grc/blocks/Makefile \
-        grc/examples/Makefile \
         grc/freedesktop/Makefile \
         grc/grc_gnuradio/Makefile \
         grc/gui/Makefile \
diff --git a/gnuradio-examples/Makefile.am b/gnuradio-examples/Makefile.am
index 360ae8b41..9ea890c12 100644
--- a/gnuradio-examples/Makefile.am
+++ b/gnuradio-examples/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004,2007 Free Software Foundation, Inc.
+# Copyright 2004,2007,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -23,5 +23,5 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS = c++
 if PYTHON
-SUBDIRS += python
+SUBDIRS += python grc
 endif
diff --git a/grc/examples/.gitignore b/gnuradio-examples/grc/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/grc/examples/.gitignore
+++ b/gnuradio-examples/grc/.gitignore
diff --git a/grc/examples/Makefile.am b/gnuradio-examples/grc/Makefile.am
index 54620e156..97417c5a2 100644
--- a/grc/examples/Makefile.am
+++ b/gnuradio-examples/grc/Makefile.am
@@ -30,7 +30,8 @@ dist_audiodata_DATA = \
 
 demoddatadir = $(grc_examples_prefix)/demod
 dist_demoddata_DATA = \
-	demod/mpsk_demod.grc
+	demod/mpsk_demod.grc \
+	demod/pam_timing.grc
 
 simpledatadir = $(grc_examples_prefix)/simple
 dist_simpledata_DATA = \
diff --git a/grc/examples/audio/.gitignore b/gnuradio-examples/grc/audio/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/grc/examples/audio/.gitignore
+++ b/gnuradio-examples/grc/audio/.gitignore
diff --git a/grc/examples/audio/cvsd_sweep.grc b/gnuradio-examples/grc/audio/cvsd_sweep.grc
index 8d0b385ce..8d0b385ce 100644
--- a/grc/examples/audio/cvsd_sweep.grc
+++ b/gnuradio-examples/grc/audio/cvsd_sweep.grc
diff --git a/grc/examples/audio/dial_tone.grc b/gnuradio-examples/grc/audio/dial_tone.grc
index ac8cbef27..ac8cbef27 100644
--- a/grc/examples/audio/dial_tone.grc
+++ b/gnuradio-examples/grc/audio/dial_tone.grc
diff --git a/grc/examples/demod/mpsk_demod.grc b/gnuradio-examples/grc/demod/mpsk_demod.grc
index 08108dcba..08108dcba 100644
--- a/grc/examples/demod/mpsk_demod.grc
+++ b/gnuradio-examples/grc/demod/mpsk_demod.grc
diff --git a/gnuradio-examples/grc/pam_timing.grc b/gnuradio-examples/grc/demod/pam_timing.grc
index 989c795a9..989c795a9 100644
--- a/gnuradio-examples/grc/pam_timing.grc
+++ b/gnuradio-examples/grc/demod/pam_timing.grc
diff --git a/grc/examples/simple/.gitignore b/gnuradio-examples/grc/simple/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/grc/examples/simple/.gitignore
+++ b/gnuradio-examples/grc/simple/.gitignore
diff --git a/grc/examples/simple/ber_simulation.grc b/gnuradio-examples/grc/simple/ber_simulation.grc
index 618add29c..618add29c 100644
--- a/grc/examples/simple/ber_simulation.grc
+++ b/gnuradio-examples/grc/simple/ber_simulation.grc
diff --git a/grc/examples/simple/dpsk_loopback.grc b/gnuradio-examples/grc/simple/dpsk_loopback.grc
index 6a507c98d..6a507c98d 100644
--- a/grc/examples/simple/dpsk_loopback.grc
+++ b/gnuradio-examples/grc/simple/dpsk_loopback.grc
diff --git a/grc/examples/simple/var_sink_taps.grc b/gnuradio-examples/grc/simple/var_sink_taps.grc
index 07207850e..07207850e 100644
--- a/grc/examples/simple/var_sink_taps.grc
+++ b/gnuradio-examples/grc/simple/var_sink_taps.grc
diff --git a/grc/examples/simple/variable_config.grc b/gnuradio-examples/grc/simple/variable_config.grc
index 95c287cce..95c287cce 100644
--- a/grc/examples/simple/variable_config.grc
+++ b/gnuradio-examples/grc/simple/variable_config.grc
diff --git a/grc/examples/trellis/.gitignore b/gnuradio-examples/grc/trellis/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/grc/examples/trellis/.gitignore
+++ b/gnuradio-examples/grc/trellis/.gitignore
diff --git a/grc/examples/trellis/interference_cancellation.grc b/gnuradio-examples/grc/trellis/interference_cancellation.grc
index e93babd78..e93babd78 100644
--- a/grc/examples/trellis/interference_cancellation.grc
+++ b/gnuradio-examples/grc/trellis/interference_cancellation.grc
diff --git a/grc/examples/trellis/readme.txt b/gnuradio-examples/grc/trellis/readme.txt
index d620fd628..d620fd628 100644
--- a/grc/examples/trellis/readme.txt
+++ b/gnuradio-examples/grc/trellis/readme.txt
diff --git a/grc/examples/usrp/.gitignore b/gnuradio-examples/grc/usrp/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/grc/examples/usrp/.gitignore
+++ b/gnuradio-examples/grc/usrp/.gitignore
diff --git a/grc/examples/usrp/usrp2_const_wave.grc b/gnuradio-examples/grc/usrp/usrp2_const_wave.grc
index fdbd7c1f3..fdbd7c1f3 100644
--- a/grc/examples/usrp/usrp2_const_wave.grc
+++ b/gnuradio-examples/grc/usrp/usrp2_const_wave.grc
diff --git a/grc/examples/usrp/usrp2_dpsk_mod.grc b/gnuradio-examples/grc/usrp/usrp2_dpsk_mod.grc
index e9f9b41ea..e9f9b41ea 100644
--- a/grc/examples/usrp/usrp2_dpsk_mod.grc
+++ b/gnuradio-examples/grc/usrp/usrp2_dpsk_mod.grc
diff --git a/grc/examples/usrp/usrp2_fft.grc b/gnuradio-examples/grc/usrp/usrp2_fft.grc
index 134bd4614..134bd4614 100644
--- a/grc/examples/usrp/usrp2_fft.grc
+++ b/gnuradio-examples/grc/usrp/usrp2_fft.grc
diff --git a/grc/examples/usrp/usrp_two_tone_loopback.grc b/gnuradio-examples/grc/usrp/usrp_two_tone_loopback.grc
index 3df977044..3df977044 100644
--- a/grc/examples/usrp/usrp_two_tone_loopback.grc
+++ b/gnuradio-examples/grc/usrp/usrp_two_tone_loopback.grc
diff --git a/grc/examples/usrp/usrp_wbfm_receive.grc b/gnuradio-examples/grc/usrp/usrp_wbfm_receive.grc
index 8f53475ab..8f53475ab 100644
--- a/grc/examples/usrp/usrp_wbfm_receive.grc
+++ b/gnuradio-examples/grc/usrp/usrp_wbfm_receive.grc
diff --git a/grc/examples/xmlrpc/.gitignore b/gnuradio-examples/grc/xmlrpc/.gitignore
index b336cc7ce..b336cc7ce 100644
--- a/grc/examples/xmlrpc/.gitignore
+++ b/gnuradio-examples/grc/xmlrpc/.gitignore
diff --git a/grc/examples/xmlrpc/readme.txt b/gnuradio-examples/grc/xmlrpc/readme.txt
index c1f87c1cb..c1f87c1cb 100644
--- a/grc/examples/xmlrpc/readme.txt
+++ b/gnuradio-examples/grc/xmlrpc/readme.txt
diff --git a/grc/examples/xmlrpc/xmlrpc_client.grc b/gnuradio-examples/grc/xmlrpc/xmlrpc_client.grc
index 3bb4e7ed3..3bb4e7ed3 100644
--- a/grc/examples/xmlrpc/xmlrpc_client.grc
+++ b/gnuradio-examples/grc/xmlrpc/xmlrpc_client.grc
diff --git a/grc/examples/xmlrpc/xmlrpc_client_script.py b/gnuradio-examples/grc/xmlrpc/xmlrpc_client_script.py
index 956fa07fb..956fa07fb 100644
--- a/grc/examples/xmlrpc/xmlrpc_client_script.py
+++ b/gnuradio-examples/grc/xmlrpc/xmlrpc_client_script.py
diff --git a/grc/examples/xmlrpc/xmlrpc_server.grc b/gnuradio-examples/grc/xmlrpc/xmlrpc_server.grc
index dc539ef1b..dc539ef1b 100644
--- a/grc/examples/xmlrpc/xmlrpc_server.grc
+++ b/gnuradio-examples/grc/xmlrpc/xmlrpc_server.grc
diff --git a/grc/Makefile.am b/grc/Makefile.am
index 28408c4a8..30b955a1e 100644
--- a/grc/Makefile.am
+++ b/grc/Makefile.am
@@ -25,7 +25,6 @@ if PYTHON
 SUBDIRS = \
 	base \
 	blocks \
-	examples \
 	grc_gnuradio \
 	gui \
 	python \