diff options
| author | Josh Blum | 2011-10-11 21:35:35 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-10-11 21:35:35 -0700 |
| commit | 1259a01a9479071bd1729a9c9496444f0a72509b (patch) | |
| tree | 55350454454a119fb230cdbaadfb27d361f191ec /gnuradio-examples/grc/Makefile.am | |
| parent | 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (diff) | |
| parent | 06860c309153890a6a42babfbedf230eb24f0042 (diff) | |
| download | gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.tar.gz gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.tar.bz2 gnuradio-1259a01a9479071bd1729a9c9496444f0a72509b.zip | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Conflicts:
gr-digital/include/digital_constellation.h
Diffstat (limited to 'gnuradio-examples/grc/Makefile.am')
| -rw-r--r-- | gnuradio-examples/grc/Makefile.am | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gnuradio-examples/grc/Makefile.am b/gnuradio-examples/grc/Makefile.am index d9a0d9c2c..e99d26299 100644 --- a/gnuradio-examples/grc/Makefile.am +++ b/gnuradio-examples/grc/Makefile.am @@ -46,15 +46,15 @@ dist_trellisdata_DATA = \ trellis/readme.txt \ trellis/interference_cancellation.grc -usrpdatadir = $(grc_examples_prefix)/usrp -dist_usrpdata_DATA = \ - usrp/usrp2_const_wave.grc \ - usrp/usrp2_dpsk_mod.grc \ - usrp/usrp_rx_dpsk.grc \ - usrp/usrp_tx_dpsk.grc \ - usrp/usrp2_fft.grc \ - usrp/usrp_two_tone_loopback.grc \ - usrp/usrp_wbfm_receive.grc +uhddatadir = $(grc_examples_prefix)/uhd +dist_uhddata_DATA = \ + uhd/uhd_const_wave.grc \ + uhd/uhd_dpsk_mod.grc \ + uhd/uhd_rx_dpsk.grc \ + uhd/uhd_tx_dpsk.grc \ + uhd/uhd_fft.grc \ + uhd/uhd_two_tone_loopback.grc \ + uhd/uhd_wbfm_receive.grc xmlrpcdatadir = $(grc_examples_prefix)/xmlrpc dist_xmlrpcdata_DATA = \ |