[Commit-gnuradio] r6275 - in gnuradio/branches/developers/jcorgan/t182: . config gnuradio-examples/python gnuradio-examples/python/apps/hf_explorer gnuradio-examples/python/apps/hf_radio gnuradio-examples/python/audio gnuradio-examples/python/digital gnuradio-examples/python/digital_voice gnuradio-examples/python/multi-antenna gnuradio-examples/python/multi_usrp gnuradio-examples/python/ofdm gnuradio-examples/python/usrp gr-trellis/src gr-trellis/src/examples gr-trellis/src/examples/fsm_files

[jcorgan]

Author: jcorgan
Date: 2007-09-03 13:06:35 -0600 (Mon, 03 Sep 2007)
New Revision: 6275

Added:
   gnuradio/branches/developers/jcorgan/t182/gr-trellis/src/examples/
Removed:
   
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/channel-coding/
Modified:
   gnuradio/branches/developers/jcorgan/t182/Makefile.common
   gnuradio/branches/developers/jcorgan/t182/config/grc_gnuradio_examples.m4
   gnuradio/branches/developers/jcorgan/t182/config/grc_gr_trellis.m4
   
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/Makefile.am
   
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/apps/hf_explorer/Makefile.am
   
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/apps/hf_radio/Makefile.am
   
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/audio/Makefile.am
   
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/digital/Makefile.am
   
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/digital_voice/Makefile.am
   
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/multi-antenna/Makefile.am
   
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/multi_usrp/Makefile.am
   
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/ofdm/Makefile.am
   
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/usrp/Makefile.am
   gnuradio/branches/developers/jcorgan/t182/gr-trellis/src/Makefile.am
   gnuradio/branches/developers/jcorgan/t182/gr-trellis/src/examples/Makefile.am
   
gnuradio/branches/developers/jcorgan/t182/gr-trellis/src/examples/fsm_files/Makefile.am
Log:
Install example programs onto system.  Move channel-coding examples to 
gr-trellis/src/examples, install from there.

Modified: gnuradio/branches/developers/jcorgan/t182/Makefile.common
===================================================================
--- gnuradio/branches/developers/jcorgan/t182/Makefile.common   2007-09-03 
03:30:03 UTC (rev 6274)
+++ gnuradio/branches/developers/jcorgan/t182/Makefile.common   2007-09-03 
19:06:35 UTC (rev 6275)
@@ -96,3 +96,6 @@
 
 RUN_GUILE = 
GUILE_LOAD_PATH="@abs_top_srcdir@/pmt/src/scheme:@abs_top_srcdir@/mblock/src/scheme"
 @GUILE@ -e main -s
 COMPILE_MBH = $(RUN_GUILE) 
$(top_srcdir)/mblock/src/scheme/gnuradio/compile-mbh.scm
+
+# Base directory for example applications
+exampledir = $(datadir)/gnuradio/examples

Modified: 
gnuradio/branches/developers/jcorgan/t182/config/grc_gnuradio_examples.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/t182/config/grc_gnuradio_examples.m4   
2007-09-03 03:30:03 UTC (rev 6274)
+++ gnuradio/branches/developers/jcorgan/t182/config/grc_gnuradio_examples.m4   
2007-09-03 19:06:35 UTC (rev 6275)
@@ -28,8 +28,6 @@
         gnuradio-examples/python/apps/hf_radio/Makefile \
         gnuradio-examples/python/apps/Makefile \
         gnuradio-examples/python/audio/Makefile \
-        gnuradio-examples/python/channel-coding/Makefile \
-        gnuradio-examples/python/channel-coding/fsm_files/Makefile \
         gnuradio-examples/python/digital/Makefile \
         gnuradio-examples/python/digital_voice/Makefile \
        gnuradio-examples/python/hier/Makefile \

Modified: gnuradio/branches/developers/jcorgan/t182/config/grc_gr_trellis.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/t182/config/grc_gr_trellis.m4  
2007-09-03 03:30:03 UTC (rev 6274)
+++ gnuradio/branches/developers/jcorgan/t182/config/grc_gr_trellis.m4  
2007-09-03 19:06:35 UTC (rev 6275)
@@ -27,6 +27,8 @@
        gr-trellis/src/lib/Makefile \
        gr-trellis/src/python/Makefile \
        gr-trellis/src/python/run_tests \
+       gr-trellis/src/examples/Makefile \
+       gr-trellis/src/examples/fsm_files/Makefile
     ])
 
     passed=yes

Modified: 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/Makefile.am  
    2007-09-03 03:30:03 UTC (rev 6274)
+++ 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/Makefile.am  
    2007-09-03 19:06:35 UTC (rev 6275)
@@ -19,5 +19,25 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = apps audio channel-coding digital_voice digital multi-antenna \
-         multi_usrp networking usrp hier ofdm
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = \
+    apps \
+    audio \
+    digital_voice \
+    digital \
+    multi-antenna \
+    multi_usrp \
+    networking \
+    usrp \
+    hier \
+    ofdm
+
+# Make example scripts with #! executable
+install-data-local:
+       for i in `find $(exampledir) -type f ! -perm 755`; do \
+         if head -1 $$i | grep -q '^#!'; then \
+           chmod 755 $$i; \
+           echo "made executable: $$i"; \
+         fi; \
+       done

Modified: 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/apps/hf_explorer/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/apps/hf_explorer/Makefile.am
     2007-09-03 03:30:03 UTC (rev 6274)
+++ 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/apps/hf_explorer/Makefile.am
     2007-09-03 19:06:35 UTC (rev 6275)
@@ -19,8 +19,12 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+include $(top_srcdir)/Makefile.common
+
 EXTRA_DIST =   \
     README     \
     hfx2.py    \
     hfx_help
 
+ourdatadir = $(exampledir)/hf_explorer
+ourdata_DATA = $(EXTRA_DIST)
\ No newline at end of file

Modified: 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/apps/hf_radio/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/apps/hf_radio/Makefile.am
        2007-09-03 03:30:03 UTC (rev 6274)
+++ 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/apps/hf_radio/Makefile.am
        2007-09-03 19:06:35 UTC (rev 6275)
@@ -19,6 +19,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+include $(top_srcdir)/Makefile.common
+
 EXTRA_DIST =   \
     hfir.sci   \
     input.py   \
@@ -32,3 +34,5 @@
     startup.py \
     ui.py
 
+ourdatadir = $(exampledir)/hf_radio
+ourdata_DATA = $(EXTRA_DIST)

Modified: 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/audio/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/audio/Makefile.am
        2007-09-03 03:30:03 UTC (rev 6274)
+++ 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/audio/Makefile.am
        2007-09-03 19:06:35 UTC (rev 6275)
@@ -19,6 +19,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+include $(top_srcdir)/Makefile.common
+
 EXTRA_DIST =                   \
        audio_copy.py           \
        audio_fft.py            \
@@ -32,3 +34,6 @@
        noise.py                \
        spectrum_inversion.py   \
        test_resampler.py       
+
+ourdatadir = $(exampledir)/audio
+ourdata_DATA = $(EXTRA_DIST)

Modified: 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/digital/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/digital/Makefile.am
      2007-09-03 03:30:03 UTC (rev 6274)
+++ 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/digital/Makefile.am
      2007-09-03 19:06:35 UTC (rev 6275)
@@ -19,6 +19,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+include $(top_srcdir)/Makefile.common
+
 EXTRA_DIST =                   \
        README                  \
        benchmark_rx.py         \
@@ -32,3 +34,6 @@
        transmit_path.py        \
        tunnel.py               \
        tx_voice.py             
+
+ourdatadir = $(exampledir)/digital
+ourdata_DATA = $(EXTRA_DIST)

Modified: 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/digital_voice/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/digital_voice/Makefile.am
        2007-09-03 03:30:03 UTC (rev 6274)
+++ 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/digital_voice/Makefile.am
        2007-09-03 19:06:35 UTC (rev 6275)
@@ -19,6 +19,11 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+include $(top_srcdir)/Makefile.common
+
 EXTRA_DIST =                                   \
        encdec.py                               \
        cvsd_test.py
+
+ourdatadir = $(exampledir)/digital_voice
+ourdata_DATA = $(EXTRA_DIST)
\ No newline at end of file

Modified: 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/multi-antenna/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/multi-antenna/Makefile.am
        2007-09-03 03:30:03 UTC (rev 6274)
+++ 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/multi-antenna/Makefile.am
        2007-09-03 19:06:35 UTC (rev 6275)
@@ -19,7 +19,12 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+include $(top_srcdir)/Makefile.common
+
 EXTRA_DIST =           \
     multi_fft.py       \
     multi_file.py      \
     multi_scope.py
+
+ourdatadir = $(exampledir)/multi-antenna
+ourdata_DATA = $(EXTRA_DIST)

Modified: 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/multi_usrp/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/multi_usrp/Makefile.am
   2007-09-03 03:30:03 UTC (rev 6274)
+++ 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/multi_usrp/Makefile.am
   2007-09-03 19:06:35 UTC (rev 6275)
@@ -19,10 +19,12 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-EXTRA_DIST =                   \
-       README          \
-       multi_usrp_oscope.py            \
+include $(top_srcdir)/Makefile.common
+
+EXTRA_DIST = \
+       README \
+       multi_usrp_oscope.py \
        multi_usrp_rx_cfile.py
 
-
-
+ourdatadir = $(exampledir)/multi_usrp
+ourdata_DATA = $(EXTRA_DIST)

Modified: 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/ofdm/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/ofdm/Makefile.am
 2007-09-03 03:30:03 UTC (rev 6274)
+++ 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/ofdm/Makefile.am
 2007-09-03 19:06:35 UTC (rev 6275)
@@ -19,6 +19,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+include $(top_srcdir)/Makefile.common
+
 EXTRA_DIST =                                   \
                benchmark_ofdm.py               \
                benchmark_ofdm_rx.py            \
@@ -28,3 +30,6 @@
                pick_bitrate.py                 \
                receive_path.py                 \
                transmit_path.py
+
+ourdatadir = $(exampledir)/ofdm
+ourdata_DATA = $(EXTRA_DIST)

Modified: 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/usrp/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/usrp/Makefile.am
 2007-09-03 03:30:03 UTC (rev 6274)
+++ 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/usrp/Makefile.am
 2007-09-03 19:06:35 UTC (rev 6275)
@@ -19,6 +19,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+include $(top_srcdir)/Makefile.common
+
 EXTRA_DIST =                                   \
        am_rcv.py                               \
        ayfabtu.py                              \
@@ -47,3 +49,6 @@
        usrp_wfm_rcv2_nogui.py                  \
        usrp_wxapt_rcv.py                       \
        wfm_rcv_file.py
+
+ourdatadir = $(exampledir)/usrp
+ourdata_DATA = $(EXTRA_DIST)

Modified: gnuradio/branches/developers/jcorgan/t182/gr-trellis/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/t182/gr-trellis/src/Makefile.am        
2007-09-03 03:30:03 UTC (rev 6274)
+++ gnuradio/branches/developers/jcorgan/t182/gr-trellis/src/Makefile.am        
2007-09-03 19:06:35 UTC (rev 6275)
@@ -19,4 +19,4 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = lib python
+SUBDIRS = lib python examples

Copied: gnuradio/branches/developers/jcorgan/t182/gr-trellis/src/examples (from 
rev 6272, 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/channel-coding)

Modified: 
gnuradio/branches/developers/jcorgan/t182/gr-trellis/src/examples/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/channel-coding/Makefile.am
       2007-09-03 02:22:28 UTC (rev 6272)
+++ 
gnuradio/branches/developers/jcorgan/t182/gr-trellis/src/examples/Makefile.am   
    2007-09-03 19:06:35 UTC (rev 6275)
@@ -19,6 +19,10 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = fsm_files
+
 EXTRA_DIST =                   \
         README                 \
        fsm_utils.py            \
@@ -36,6 +40,17 @@
        test_turbo_equalization1.py     \
        test_turbo_equalization2.py     
 
-SUBDIRS = fsm_files
 
+ourdatadir = $(exampledir)/trellis
+ourdata_DATA = $(EXTRA_DIST)
+
+# Make example scripts with #! executable
+install-data-local:
+       for i in `find $(ourdatadir) -type f ! -perm 755`; do \
+         if head -1 $$i | grep -q '^#!'; then \
+           chmod 755 $$i; \
+           echo "made executable: $$i"; \
+         fi; \
+       done
+
 MOSTLYCLEANFILES = *.pyc

Modified: 
gnuradio/branches/developers/jcorgan/t182/gr-trellis/src/examples/fsm_files/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/t182/gnuradio-examples/python/channel-coding/fsm_files/Makefile.am
     2007-09-03 02:22:28 UTC (rev 6272)
+++ 
gnuradio/branches/developers/jcorgan/t182/gr-trellis/src/examples/fsm_files/Makefile.am
     2007-09-03 19:06:35 UTC (rev 6275)
@@ -19,6 +19,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
+include $(top_srcdir)/Makefile.common
+
 EXTRA_DIST =                   \
        awgn1o2_128.fsm         \
        awgn1o2_16.fsm          \
@@ -35,3 +37,5 @@
        rep5.fsm                \
        simple.fsm              
 
+ourdatadir = $(exampledir)/trellis/fsm_files
+ourdata_DATA = $(EXTRA_DIST)