From 503efe1fbe3822979b8aa3c868d3d13fbeb9af7f Mon Sep 17 00:00:00 2001
From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Thu, 26 Feb 2009 23:39:17 +0000
Subject: Merged r10504:10528 from michaelld/fix_local_data_install into trunk.
Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10529 221aa14e-8319-0410-a670-987f0aec2ac5
---
gnuradio-examples/python/Makefile.am | 11 +-----
.../python/apps/hf_explorer/Makefile.am | 13 ++++---
gnuradio-examples/python/apps/hf_radio/Makefile.am | 17 ++++----
gnuradio-examples/python/audio/Makefile.am | 11 +++---
gnuradio-examples/python/digital-bert/Makefile.am | 9 ++---
gnuradio-examples/python/digital/Makefile.am | 15 ++++----
gnuradio-examples/python/digital_voice/Makefile.am | 11 +++---
gnuradio-examples/python/mp-sched/Makefile.am | 16 ++++----
gnuradio-examples/python/multi-antenna/Makefile.am | 9 ++---
gnuradio-examples/python/multi_usrp/Makefile.am | 15 ++++----
gnuradio-examples/python/network/Makefile.am | 9 ++---
gnuradio-examples/python/ofdm/Makefile.am | 35 +++++++++--------
gnuradio-examples/python/usrp/Makefile.am | 45 +++++++++++-----------
gnuradio-examples/python/usrp2/Makefile.am | 9 ++---
14 files changed, 106 insertions(+), 119 deletions(-)
(limited to 'gnuradio-examples/python')
diff --git a/gnuradio-examples/python/Makefile.am b/gnuradio-examples/python/Makefile.am
index 068bf560d7..3a1acf51da 100644
--- a/gnuradio-examples/python/Makefile.am
+++ b/gnuradio-examples/python/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
#
@@ -34,12 +34,3 @@ SUBDIRS = \
ofdm \
usrp \
usrp2
-
-# 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
diff --git a/gnuradio-examples/python/apps/hf_explorer/Makefile.am b/gnuradio-examples/python/apps/hf_explorer/Makefile.am
index deb6c32d81..88ad52128e 100644
--- a/gnuradio-examples/python/apps/hf_explorer/Makefile.am
+++ b/gnuradio-examples/python/apps/hf_explorer/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2006,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,10 +21,11 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
- README \
- hfx2.py \
+ourdatadir = $(exampledir)/hf_explorer
+
+dist_ourdata_DATA = \
+ README \
hfx_help
-ourdatadir = $(exampledir)/hf_explorer
-ourdata_DATA = $(EXTRA_DIST)
\ No newline at end of file
+dist_ourdata_SCRIPTS = \
+ hfx2.py
diff --git a/gnuradio-examples/python/apps/hf_radio/Makefile.am b/gnuradio-examples/python/apps/hf_radio/Makefile.am
index a6a4dfe3d3..70b516d5dd 100644
--- a/gnuradio-examples/python/apps/hf_radio/Makefile.am
+++ b/gnuradio-examples/python/apps/hf_radio/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2006,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,18 +21,19 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
+ourdatadir = $(exampledir)/hf_radio
+
+dist_ourdata_DATA = \
hfir.sci \
+ radio.xml \
+ README.TXT \
+ ssb_taps
+
+dist_ourdata_SCRIPTS = \
input.py \
output.py \
radio.py \
- radio.xml \
- README.TXT \
ssbagc.py \
ssbdemod.py \
- ssb_taps \
startup.py \
ui.py
-
-ourdatadir = $(exampledir)/hf_radio
-ourdata_DATA = $(EXTRA_DIST)
diff --git a/gnuradio-examples/python/audio/Makefile.am b/gnuradio-examples/python/audio/Makefile.am
index dc200219ec..356b515598 100644
--- a/gnuradio-examples/python/audio/Makefile.am
+++ b/gnuradio-examples/python/audio/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,7 +21,9 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
+ourdatadir = $(exampledir)/audio
+
+dist_ourdata_SCRIPTS = \
audio_copy.py \
audio_fft.py \
audio_play.py \
@@ -33,7 +35,4 @@ EXTRA_DIST = \
multi_tone.py \
noise.py \
spectrum_inversion.py \
- test_resampler.py
-
-ourdatadir = $(exampledir)/audio
-ourdata_DATA = $(EXTRA_DIST)
+ test_resampler.py
diff --git a/gnuradio-examples/python/digital-bert/Makefile.am b/gnuradio-examples/python/digital-bert/Makefile.am
index 886033792d..4275af5492 100644
--- a/gnuradio-examples/python/digital-bert/Makefile.am
+++ b/gnuradio-examples/python/digital-bert/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,13 +21,12 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
+ourdatadir = $(exampledir)/digital-bert
+
+dist_ourdata_SCRIPTS = \
benchmark_rx.py \
benchmark_tx.py \
receive_path.py \
transmit_path.py
-ourdatadir = $(exampledir)/digital-bert
-ourdata_DATA = $(EXTRA_DIST)
-
MOSTLYCLEANFILES = *.pyc *.pyo *~
diff --git a/gnuradio-examples/python/digital/Makefile.am b/gnuradio-examples/python/digital/Makefile.am
index ed941e4f78..2bc448165d 100644
--- a/gnuradio-examples/python/digital/Makefile.am
+++ b/gnuradio-examples/python/digital/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,8 +21,12 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
- README \
+ourdatadir = $(exampledir)/digital
+
+dist_ourdata_DATA = \
+ README
+
+dist_ourdata_SCRIPTS = \
benchmark_loopback.py \
benchmark_rx.py \
benchmark_tx.py \
@@ -36,9 +40,6 @@ EXTRA_DIST = \
transmit_path.py \
transmit_path_lb.py \
tunnel.py \
- tx_voice.py
-
-ourdatadir = $(exampledir)/digital
-ourdata_DATA = $(EXTRA_DIST)
+ tx_voice.py
MOSTLYCLEANFILES = *.pyc *.pyo *~
diff --git a/gnuradio-examples/python/digital_voice/Makefile.am b/gnuradio-examples/python/digital_voice/Makefile.am
index 08bd48821d..60f363b90d 100644
--- a/gnuradio-examples/python/digital_voice/Makefile.am
+++ b/gnuradio-examples/python/digital_voice/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2004,2005 Free Software Foundation, Inc.
+# Copyright 2004,2005,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,9 +21,8 @@
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
+
+dist_ourdata_SCRIPTS = \
+ encdec.py \
+ cvsd_test.py
diff --git a/gnuradio-examples/python/mp-sched/Makefile.am b/gnuradio-examples/python/mp-sched/Makefile.am
index bd4b4e8d4e..4fc29b0594 100644
--- a/gnuradio-examples/python/mp-sched/Makefile.am
+++ b/gnuradio-examples/python/mp-sched/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -20,12 +20,10 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
- plot_flops.py \
- run_synthetic.py \
- synthetic.py \
- wfm_rcv_pll_to_wav.py
-
-
ourdatadir = $(exampledir)/mp-sched
-ourdata_DATA = $(EXTRA_DIST)
+
+dist_ourdata_SCRIPTS = \
+ plot_flops.py \
+ run_synthetic.py \
+ synthetic.py \
+ wfm_rcv_pll_to_wav.py
diff --git a/gnuradio-examples/python/multi-antenna/Makefile.am b/gnuradio-examples/python/multi-antenna/Makefile.am
index 7e620b3ab6..0cb944589e 100644
--- a/gnuradio-examples/python/multi-antenna/Makefile.am
+++ b/gnuradio-examples/python/multi-antenna/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2006,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,10 +21,9 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
+ourdatadir = $(exampledir)/multi-antenna
+
+dist_ourdata_SCRIPTS = \
multi_fft.py \
multi_file.py \
multi_scope.py
-
-ourdatadir = $(exampledir)/multi-antenna
-ourdata_DATA = $(EXTRA_DIST)
diff --git a/gnuradio-examples/python/multi_usrp/Makefile.am b/gnuradio-examples/python/multi_usrp/Makefile.am
index 01119bb8a7..2ef10b6e87 100644
--- a/gnuradio-examples/python/multi_usrp/Makefile.am
+++ b/gnuradio-examples/python/multi_usrp/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2006,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,10 +21,11 @@
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)
+
+dist_ourdata_DATA = \
+ README
+
+dist_ourdata_SCRIPTS = \
+ multi_usrp_oscope.py \
+ multi_usrp_rx_cfile.py
diff --git a/gnuradio-examples/python/network/Makefile.am b/gnuradio-examples/python/network/Makefile.am
index 5786230934..a5dddeec34 100644
--- a/gnuradio-examples/python/network/Makefile.am
+++ b/gnuradio-examples/python/network/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,7 +21,9 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
+ourdatadir = $(exampledir)/network
+
+dist_ourdata_SCRIPTS = \
audio_sink.py \
audio_source.py \
dial_tone_sink.py \
@@ -29,7 +31,4 @@ EXTRA_DIST = \
vector_sink.py \
vector_source.py
-ourdatadir = $(exampledir)/network
-ourdata_DATA = $(EXTRA_DIST)
-
MOSTLYCLEANFILES = *.pyc *~
diff --git a/gnuradio-examples/python/ofdm/Makefile.am b/gnuradio-examples/python/ofdm/Makefile.am
index c951dd1647..a42d4017da 100644
--- a/gnuradio-examples/python/ofdm/Makefile.am
+++ b/gnuradio-examples/python/ofdm/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,20 +21,21 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
- benchmark_ofdm.py \
- benchmark_ofdm_rx.py \
- benchmark_ofdm_tx.py \
- fftshift.py \
- fusb_options.py \
- pick_bitrate.py \
- receive_path.py \
- transmit_path.py \
- ofdm_mod_demod_test.py \
- ofdm_sync.m \
- ofdm_sync_pn.m \
- plot_ofdm.m \
- tunnel.py
-
ourdatadir = $(exampledir)/ofdm
-ourdata_DATA = $(EXTRA_DIST)
+
+dist_ourdata_DATA = \
+ ofdm_sync.m \
+ ofdm_sync_pn.m \
+ plot_ofdm.m
+
+dist_ourdata_SCRIPTS = \
+ benchmark_ofdm.py \
+ benchmark_ofdm_rx.py \
+ benchmark_ofdm_tx.py \
+ fftshift.py \
+ fusb_options.py \
+ pick_bitrate.py \
+ receive_path.py \
+ transmit_path.py \
+ ofdm_mod_demod_test.py \
+ tunnel.py
diff --git a/gnuradio-examples/python/usrp/Makefile.am b/gnuradio-examples/python/usrp/Makefile.am
index 17ca738970..635da3b6ea 100644
--- a/gnuradio-examples/python/usrp/Makefile.am
+++ b/gnuradio-examples/python/usrp/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2004,2005 Free Software Foundation, Inc.
+# Copyright 2004,2005,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,26 +21,25 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
- fm_tx_2_daughterboards.py \
- fm_tx4.py \
- max_power.py \
- test_dft_analysis.py \
- test_dft_synth.py \
- usrp_benchmark_usb.py \
- usrp_nbfm_ptt.py \
- usrp_nbfm_rcv.py \
- usrp_spectrum_sense.py \
- usrp_test_loop_lfsr.py \
- usrp_tv_rcv_nogui.py \
- usrp_tv_rcv.py \
- usrp_wfm_rcv.py \
- usrp_wfm_rcv_nogui.py \
- usrp_wfm_rcv_pll.py \
- usrp_wfm_rcv_sca.py \
- usrp_wfm_rcv2_nogui.py \
- usrp_wxapt_rcv.py \
- usrp_am_mw_rcv.py
-
ourdatadir = $(exampledir)/usrp
-ourdata_DATA = $(EXTRA_DIST)
+
+dist_ourdata_SCRIPTS = \
+ fm_tx_2_daughterboards.py \
+ fm_tx4.py \
+ max_power.py \
+ test_dft_analysis.py \
+ test_dft_synth.py \
+ usrp_benchmark_usb.py \
+ usrp_nbfm_ptt.py \
+ usrp_nbfm_rcv.py \
+ usrp_spectrum_sense.py \
+ usrp_test_loop_lfsr.py \
+ usrp_tv_rcv_nogui.py \
+ usrp_tv_rcv.py \
+ usrp_wfm_rcv.py \
+ usrp_wfm_rcv_nogui.py \
+ usrp_wfm_rcv_pll.py \
+ usrp_wfm_rcv_sca.py \
+ usrp_wfm_rcv2_nogui.py \
+ usrp_wxapt_rcv.py \
+ usrp_am_mw_rcv.py
diff --git a/gnuradio-examples/python/usrp2/Makefile.am b/gnuradio-examples/python/usrp2/Makefile.am
index 93af116751..4d2af8ee65 100644
--- a/gnuradio-examples/python/usrp2/Makefile.am
+++ b/gnuradio-examples/python/usrp2/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2004,2005 Free Software Foundation, Inc.
+# Copyright 2004,2005,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,8 +21,7 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
- usrp2_wfm_rcv.py
-
ourdatadir = $(exampledir)/usrp2
-ourdata_DATA = $(EXTRA_DIST)
+
+dist_ourdata_SCRIPTS = \
+ usrp2_wfm_rcv.py
--
cgit v1.2.3