summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/grc_gnuradio_examples.m411
-rw-r--r--config/grc_grc.m41
-rw-r--r--gnuradio-examples/Makefile.am4
-rw-r--r--gnuradio-examples/grc/.gitignore (renamed from grc/examples/.gitignore)0
-rw-r--r--gnuradio-examples/grc/Makefile.am (renamed from grc/examples/Makefile.am)5
-rw-r--r--gnuradio-examples/grc/audio/cvsd_sweep.grc (renamed from grc/examples/audio/cvsd_sweep.grc)0
-rw-r--r--gnuradio-examples/grc/audio/dial_tone.grc (renamed from grc/examples/audio/dial_tone.grc)0
-rw-r--r--gnuradio-examples/grc/demod/mpsk_demod.grc586
-rw-r--r--gnuradio-examples/grc/demod/pam_timing.grc (renamed from gnuradio-examples/grc/pam_timing.grc)0
-rw-r--r--gnuradio-examples/grc/simple/ber_simulation.grc (renamed from grc/examples/simple/ber_simulation.grc)0
-rw-r--r--gnuradio-examples/grc/simple/dpsk_loopback.grc (renamed from grc/examples/simple/dpsk_loopback.grc)0
-rw-r--r--gnuradio-examples/grc/simple/var_sink_taps.grc (renamed from grc/examples/simple/var_sink_taps.grc)0
-rw-r--r--gnuradio-examples/grc/simple/variable_config.grc (renamed from grc/examples/simple/variable_config.grc)0
-rw-r--r--gnuradio-examples/grc/trellis/interference_cancellation.grc (renamed from grc/examples/trellis/interference_cancellation.grc)0
-rw-r--r--gnuradio-examples/grc/trellis/readme.txt (renamed from grc/examples/trellis/readme.txt)0
-rw-r--r--gnuradio-examples/grc/usrp/usrp2_const_wave.grc (renamed from grc/examples/usrp/usrp2_const_wave.grc)0
-rw-r--r--gnuradio-examples/grc/usrp/usrp2_dpsk_mod.grc (renamed from grc/examples/usrp/usrp2_dpsk_mod.grc)0
-rw-r--r--gnuradio-examples/grc/usrp/usrp2_fft.grc (renamed from grc/examples/usrp/usrp2_fft.grc)0
-rw-r--r--gnuradio-examples/grc/usrp/usrp_two_tone_loopback.grc (renamed from grc/examples/usrp/usrp_two_tone_loopback.grc)0
-rw-r--r--gnuradio-examples/grc/usrp/usrp_wbfm_receive.grc (renamed from grc/examples/usrp/usrp_wbfm_receive.grc)0
-rw-r--r--gnuradio-examples/grc/xmlrpc/readme.txt (renamed from grc/examples/xmlrpc/readme.txt)0
-rw-r--r--gnuradio-examples/grc/xmlrpc/xmlrpc_client.grc (renamed from grc/examples/xmlrpc/xmlrpc_client.grc)0
-rw-r--r--gnuradio-examples/grc/xmlrpc/xmlrpc_client_script.py (renamed from grc/examples/xmlrpc/xmlrpc_client_script.py)0
-rw-r--r--gnuradio-examples/grc/xmlrpc/xmlrpc_server.grc (renamed from grc/examples/xmlrpc/xmlrpc_server.grc)0
-rw-r--r--grc/Makefile.am1
-rw-r--r--grc/examples/audio/.gitignore2
-rw-r--r--grc/examples/simple/.gitignore2
-rw-r--r--grc/examples/trellis/.gitignore2
-rw-r--r--grc/examples/usrp/.gitignore2
-rw-r--r--grc/examples/xmlrpc/.gitignore2
30 files changed, 599 insertions, 19 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 78321ce0a..97417c5a2 100644
--- a/grc/examples/Makefile.am
+++ b/gnuradio-examples/grc/Makefile.am
@@ -28,6 +28,11 @@ dist_audiodata_DATA = \
audio/dial_tone.grc \
audio/cvsd_sweep.grc
+demoddatadir = $(grc_examples_prefix)/demod
+dist_demoddata_DATA = \
+ demod/mpsk_demod.grc \
+ demod/pam_timing.grc
+
simpledatadir = $(grc_examples_prefix)/simple
dist_simpledata_DATA = \
simple/ber_simulation.grc \
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/gnuradio-examples/grc/demod/mpsk_demod.grc b/gnuradio-examples/grc/demod/mpsk_demod.grc
new file mode 100644
index 000000000..08108dcba
--- /dev/null
+++ b/gnuradio-examples/grc/demod/mpsk_demod.grc
@@ -0,0 +1,586 @@
+<?xml version='1.0' encoding='ASCII'?>
+<flow_graph>
+ <timestamp>Mon Oct 5 18:34:52 2009</timestamp>
+ <block>
+ <key>options</key>
+ <param>
+ <key>id</key>
+ <value>mpsk_demod</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value>MPSK Demod Demo</value>
+ </param>
+ <param>
+ <key>author</key>
+ <value></value>
+ </param>
+ <param>
+ <key>description</key>
+ <value></value>
+ </param>
+ <param>
+ <key>window_size</key>
+ <value>1280, 1024</value>
+ </param>
+ <param>
+ <key>generate_options</key>
+ <value>wx_gui</value>
+ </param>
+ <param>
+ <key>category</key>
+ <value>Custom</value>
+ </param>
+ <param>
+ <key>run_options</key>
+ <value>prompt</value>
+ </param>
+ <param>
+ <key>run</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>realtime_scheduling</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(10, 10)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>32000</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(10, 170)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>random_source_x</key>
+ <param>
+ <key>id</key>
+ <value>random_source_x_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>byte</value>
+ </param>
+ <param>
+ <key>min</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>max</key>
+ <value>2**8</value>
+ </param>
+ <param>
+ <key>num_samps</key>
+ <value>10000</value>
+ </param>
+ <param>
+ <key>repeat</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(155, 160)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>blks2_dxpsk_mod</key>
+ <param>
+ <key>id</key>
+ <value>blks2_dxpsk_mod_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>dqpsk</value>
+ </param>
+ <param>
+ <key>samples_per_symbol</key>
+ <value>samps_per_sym</value>
+ </param>
+ <param>
+ <key>excess_bw</key>
+ <value>0.35</value>
+ </param>
+ <param>
+ <key>gray_code</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>verbose</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>log</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(391, 54)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>gr_throttle</key>
+ <param>
+ <key>id</key>
+ <value>gr_throttle_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>samples_per_second</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>vlen</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(654, 142)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>samps_per_sym</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>4</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(7, 89)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>gr_channel_model</key>
+ <param>
+ <key>id</key>
+ <value>gr_channel_model_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>noise_voltage</key>
+ <value>noise</value>
+ </param>
+ <param>
+ <key>freq_offset</key>
+ <value>freq_off</value>
+ </param>
+ <param>
+ <key>epsilon</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>taps</key>
+ <value>1.0</value>
+ </param>
+ <param>
+ <key>seed</key>
+ <value>42</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(487, 282)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable_slider</key>
+ <param>
+ <key>id</key>
+ <value>noise</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>label</key>
+ <value>Noise</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>.1</value>
+ </param>
+ <param>
+ <key>min</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>max</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>num_steps</key>
+ <value>100</value>
+ </param>
+ <param>
+ <key>style</key>
+ <value>wx.SL_HORIZONTAL</value>
+ </param>
+ <param>
+ <key>converver</key>
+ <value>float_converter</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value></value>
+ </param>
+ <param>
+ <key>notebook</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(259, 353)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>variable_slider</key>
+ <param>
+ <key>id</key>
+ <value>freq_off</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>label</key>
+ <value>Freq Offset</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>min</key>
+ <value>-.5</value>
+ </param>
+ <param>
+ <key>max</key>
+ <value>.5</value>
+ </param>
+ <param>
+ <key>num_steps</key>
+ <value>1000</value>
+ </param>
+ <param>
+ <key>style</key>
+ <value>wx.SL_HORIZONTAL</value>
+ </param>
+ <param>
+ <key>converver</key>
+ <value>float_converter</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value></value>
+ </param>
+ <param>
+ <key>notebook</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(126, 345)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>notebook</key>
+ <param>
+ <key>id</key>
+ <value>notebook</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>style</key>
+ <value>wx.NB_TOP</value>
+ </param>
+ <param>
+ <key>labels</key>
+ <value>['Constellation', 'Spectrum']</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value></value>
+ </param>
+ <param>
+ <key>notebook</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(520, 407)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>wxgui_constellationsink2</key>
+ <param>
+ <key>id</key>
+ <value>wxgui_constellationsink2_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value>Constellation Plot</value>
+ </param>
+ <param>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>frame_rate</key>
+ <value>5</value>
+ </param>
+ <param>
+ <key>const_size</key>
+ <value>2048</value>
+ </param>
+ <param>
+ <key>M</key>
+ <value>4</value>
+ </param>
+ <param>
+ <key>theta</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>alpha</key>
+ <value>0.005</value>
+ </param>
+ <param>
+ <key>fmax</key>
+ <value>0.06</value>
+ </param>
+ <param>
+ <key>mu</key>
+ <value>0.5</value>
+ </param>
+ <param>
+ <key>gain_mu</key>
+ <value>0.005</value>
+ </param>
+ <param>
+ <key>symbol_rate</key>
+ <value>samp_rate/4.</value>
+ </param>
+ <param>
+ <key>omega_limit</key>
+ <value>0.005</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value></value>
+ </param>
+ <param>
+ <key>notebook</key>
+ <value>notebook, 0</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(824, 212)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>wxgui_fftsink2</key>
+ <param>
+ <key>id</key>
+ <value>wxgui_fftsink2_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>title</key>
+ <value>FFT Plot</value>
+ </param>
+ <param>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>baseband_freq</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>y_per_div</key>
+ <value>10</value>
+ </param>
+ <param>
+ <key>y_divs</key>
+ <value>10</value>
+ </param>
+ <param>
+ <key>ref_level</key>
+ <value>50</value>
+ </param>
+ <param>
+ <key>ref_scale</key>
+ <value>2.0</value>
+ </param>
+ <param>
+ <key>fft_size</key>
+ <value>1024</value>
+ </param>
+ <param>
+ <key>fft_rate</key>
+ <value>30</value>
+ </param>
+ <param>
+ <key>peak_hold</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>average</key>
+ <value>False</value>
+ </param>
+ <param>
+ <key>avg_alpha</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value></value>
+ </param>
+ <param>
+ <key>notebook</key>
+ <value>notebook, 1</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(847, 10)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <connection>
+ <source_block_id>random_source_x_0</source_block_id>
+ <sink_block_id>blks2_dxpsk_mod_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>gr_throttle_0</source_block_id>
+ <sink_block_id>wxgui_constellationsink2_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>gr_throttle_0</source_block_id>
+ <sink_block_id>wxgui_fftsink2_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>blks2_dxpsk_mod_0</source_block_id>
+ <sink_block_id>gr_channel_model_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+ <connection>
+ <source_block_id>gr_channel_model_0</source_block_id>
+ <sink_block_id>gr_throttle_0</sink_block_id>
+ <source_key>0</source_key>
+ <sink_key>0</sink_key>
+ </connection>
+</flow_graph>
diff --git a/gnuradio-examples/grc/pam_timing.grc b/gnuradio-examples/grc/demod/pam_timing.grc
index 8722714b8..8722714b8 100644
--- a/gnuradio-examples/grc/pam_timing.grc
+++ b/gnuradio-examples/grc/demod/pam_timing.grc
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/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/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/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 \
diff --git a/grc/examples/audio/.gitignore b/grc/examples/audio/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/grc/examples/audio/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/grc/examples/simple/.gitignore b/grc/examples/simple/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/grc/examples/simple/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/grc/examples/trellis/.gitignore b/grc/examples/trellis/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/grc/examples/trellis/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/grc/examples/usrp/.gitignore b/grc/examples/usrp/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/grc/examples/usrp/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in
diff --git a/grc/examples/xmlrpc/.gitignore b/grc/examples/xmlrpc/.gitignore
deleted file mode 100644
index b336cc7ce..000000000
--- a/grc/examples/xmlrpc/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Makefile
-/Makefile.in