[Commit-gnuradio] r10776 - in gnuradio/branches/developers/jblum/grc: config grc grc/examples grc/examples/audio grc/examples/simple grc/examples/trellis grc/examples/usrp grc/examples/xmlrpc

[jblum]

Author: jblum
Date: 2009-04-05 02:51:20 -0600 (Sun, 05 Apr 2009)
New Revision: 10776

Removed:
   gnuradio/branches/developers/jblum/grc/grc/examples/audio/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/examples/simple/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/examples/trellis/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/examples/usrp/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/examples/xmlrpc/Makefile.am
Modified:
   gnuradio/branches/developers/jblum/grc/config/grc_grc.m4
   gnuradio/branches/developers/jblum/grc/grc/Makefile.inc
   gnuradio/branches/developers/jblum/grc/grc/examples/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/examples/audio/
   gnuradio/branches/developers/jblum/grc/grc/examples/simple/
   gnuradio/branches/developers/jblum/grc/grc/examples/trellis/
   gnuradio/branches/developers/jblum/grc/grc/examples/usrp/
   gnuradio/branches/developers/jblum/grc/grc/examples/xmlrpc/
   gnuradio/branches/developers/jblum/grc/grc/todo.txt
Log:
Unified makefile for grc examples.
Makes adding examples easier.



Modified: gnuradio/branches/developers/jblum/grc/config/grc_grc.m4
===================================================================
--- gnuradio/branches/developers/jblum/grc/config/grc_grc.m4    2009-04-05 
06:40:07 UTC (rev 10775)
+++ gnuradio/branches/developers/jblum/grc/config/grc_grc.m4    2009-04-05 
08:51:20 UTC (rev 10776)
@@ -60,11 +60,6 @@
         grc/src/utils/Makefile \
         grc/src/gui/Makefile \
         grc/examples/Makefile \
-        grc/examples/xmlrpc/Makefile \
-        grc/examples/usrp/Makefile \
-        grc/examples/audio/Makefile \
-        grc/examples/simple/Makefile \
-        grc/examples/trellis/Makefile \
         grc/Makefile \
         grc/data/Makefile \
         grc/data/platforms/Makefile \

Modified: gnuradio/branches/developers/jblum/grc/grc/Makefile.inc
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/Makefile.inc     2009-04-05 
06:40:07 UTC (rev 10775)
+++ gnuradio/branches/developers/jblum/grc/grc/Makefile.inc     2009-04-05 
08:51:20 UTC (rev 10776)
@@ -23,7 +23,6 @@
 grc_gnuradio_prefix = $(pythondir)/grc_gnuradio
 grc_src_prefix = $(pythondir)/gnuradio/grc
 grc_data_prefix = $(datadir)/$(PACKAGE)/grc
-grc_examples_prefix = $(exampledir)/grc
 grc_base_data_dir = $(grc_data_prefix)/platforms/base
 grc_python_data_dir = $(grc_data_prefix)/platforms/python
 grc_python_blocks_dir = $(grc_data_prefix)/platforms/python/blocks

Modified: gnuradio/branches/developers/jblum/grc/grc/examples/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/examples/Makefile.am     
2009-04-05 06:40:07 UTC (rev 10775)
+++ gnuradio/branches/developers/jblum/grc/grc/examples/Makefile.am     
2009-04-05 08:51:20 UTC (rev 10776)
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2009 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -19,11 +19,34 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.inc
+include $(top_srcdir)/Makefile.common
 
-SUBDIRS = \
-       audio \
-       simple \
-       trellis \
-       usrp \
-       xmlrpc
+grc_examples_prefix = $(exampledir)/grc
+
+audiodatadir = $(grc_examples_prefix)/audio
+dist_audiodata_DATA = \
+       audio/dial_tone.grc
+
+simpledatadir = $(grc_examples_prefix)/simple
+dist_simpledata_DATA = \
+       simple/ber_simulation.grc \
+       simple/dpsk_loopback.grc
+
+trellisdatadir = $(grc_examples_prefix)/trellis
+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_fft.grc \
+       usrp/usrp_two_tone_loopback.grc \
+       usrp/usrp_wbfm_receive.grc
+
+xmlrpcdatadir = $(grc_examples_prefix)/xmlrpc
+dist_xmlrpcdata_DATA = \
+       xmlrpc/readme.txt \
+       xmlrpc/xmlrpc_client.grc \
+       xmlrpc/xmlrpc_client_script.py\
+       xmlrpc/xmlrpc_server.grc


Property changes on: gnuradio/branches/developers/jblum/grc/grc/examples/audio
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in

   + 



Property changes on: gnuradio/branches/developers/jblum/grc/grc/examples/simple
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in

   + 



Property changes on: gnuradio/branches/developers/jblum/grc/grc/examples/trellis
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in

   + 



Property changes on: gnuradio/branches/developers/jblum/grc/grc/examples/usrp
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in

   + 



Property changes on: gnuradio/branches/developers/jblum/grc/grc/examples/xmlrpc
___________________________________________________________________
Modified: svn:ignore
   - Makefile
Makefile.in

   + 


Modified: gnuradio/branches/developers/jblum/grc/grc/todo.txt
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/todo.txt 2009-04-05 06:40:07 UTC 
(rev 10775)
+++ gnuradio/branches/developers/jblum/grc/grc/todo.txt 2009-04-05 08:51:20 UTC 
(rev 10776)
@@ -14,8 +14,6 @@
 -search for blocks
 -click and drag on whitespace to scroll
 -gui grid editor for configuring grid params/placing wxgui plots and controls
--grid param chooser gui
--histogram plot
 
 ##################################################
 # Problems