[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r10520 - in gnuradio/branches/developers/michaelld/fix
|
From: |
michaelld |
|
Subject: |
[Commit-gnuradio] r10520 - in gnuradio/branches/developers/michaelld/fix_local_data_install: 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-bert gnuradio-examples/python/digital_voice gnuradio-examples/python/mp-sched gnuradio-examples/python/multi-antenna gnuradio-examples/python/multi_usrp gnuradio-examples/python/network gnuradio-examples/python/ofdm gnuradio-examples/python/usrp gnuradio-examples/python/usrp2 gr-atsc/src/python gr-gcell/src/examples gr-trellis/src/examples gr-trellis/src/examples/fsm_files |
|
Date: |
Wed, 25 Feb 2009 20:58:45 -0700 (MST) |
Author: michaelld
Date: 2009-02-25 20:58:45 -0700 (Wed, 25 Feb 2009)
New Revision: 10520
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/apps/hf_explorer/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/apps/hf_radio/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/audio/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/digital-bert/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/digital/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/digital_voice/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/mp-sched/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/multi-antenna/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/multi_usrp/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/network/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/ofdm/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/usrp/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/usrp2/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-atsc/src/python/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-gcell/src/examples/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-trellis/src/examples/Makefile.am
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-trellis/src/examples/fsm_files/Makefile.am
Log:
Split installation and distribution of EXTRA_DIST into ourdir_DATA and
_SCRIPTS. The latter removes then need for a local
"install-data-local" hook to chmod 755 the scripts to be executable.
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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 @@
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
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/apps/hf_explorer/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/apps/hf_explorer/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/apps/hf_explorer/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/apps/hf_radio/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/apps/hf_radio/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/apps/hf_radio/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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)
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/audio/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/audio/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/audio/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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 @@
multi_tone.py \
noise.py \
spectrum_inversion.py \
- test_resampler.py
-
-ourdatadir = $(exampledir)/audio
-ourdata_DATA = $(EXTRA_DIST)
+ test_resampler.py
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/digital/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/digital/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/digital/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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 @@
transmit_path.py \
transmit_path_lb.py \
tunnel.py \
- tx_voice.py
+ tx_voice.py
-ourdatadir = $(exampledir)/digital
-ourdata_DATA = $(EXTRA_DIST)
-
MOSTLYCLEANFILES = *.pyc *.pyo *~
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/digital-bert/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/digital-bert/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/digital-bert/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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 *~
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/digital_voice/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/digital_voice/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/digital_voice/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/mp-sched/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/mp-sched/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/mp-sched/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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)
+
+ourdata_SCRIPTS = \
+ plot_flops.py \
+ run_synthetic.py \
+ synthetic.py \
+ wfm_rcv_pll_to_wav.py
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/multi-antenna/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/multi-antenna/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/multi-antenna/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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)
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/multi_usrp/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/multi_usrp/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/multi_usrp/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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 \
+ourdatadir = $(exampledir)/multi_usrp
+
+dist_ourdata_DATA = \
+ README
+
+dist_ourdata_SCRIPTS = \
+ multi_usrp_oscope.py \
multi_usrp_rx_cfile.py
-
-ourdatadir = $(exampledir)/multi_usrp
-ourdata_DATA = $(EXTRA_DIST)
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/network/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/network/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/network/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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 @@
vector_sink.py \
vector_source.py
-ourdatadir = $(exampledir)/network
-ourdata_DATA = $(EXTRA_DIST)
-
MOSTLYCLEANFILES = *.pyc *~
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/ofdm/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/ofdm/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/ofdm/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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
-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
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/usrp/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/usrp/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/usrp/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/usrp2/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/usrp2/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-examples/python/usrp2/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-atsc/src/python/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-atsc/src/python/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-atsc/src/python/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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,34 +21,24 @@
include $(top_srcdir)/Makefile.common
-EXAMPLE_FILES = \
- README \
- btl-fsd.py \
- fpll.py \
- interp.py \
- xlate.py \
- viterbi-out.py
+EXTRA_DIST = \
+ run_tests.in
-EXTRA_DIST = run_tests.in \
- $(EXAMPLE_FILES)
-
ourdatadir = $(exampledir)/atsc
-ourdata_DATA = $(EXAMPLE_FILES)
+dist_ourdata_DATA = \
+ README
+dist_ourdata_SCRIPTS = \
+ btl-fsd.py \
+ fpll.py \
+ interp.py \
+ xlate.py \
+ viterbi-out.py
+
TESTS = \
run_tests
-
noinst_PYTHON = \
atsc_utils.py \
qa_atsc.py
-
-# Make example scripts with #! executable
-install-data-local: install-ourdataDATA
- 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
Modified:
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-gcell/src/examples/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-gcell/src/examples/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-gcell/src/examples/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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,22 +21,10 @@
include $(top_srcdir)/Makefile.common
-#EXTRA_DIST = \
-# README \
-# fsm_utils.py
+#ourdatadir = $(exampledir)/gcell
+#dist_ourdata_DATA = README
-ourdatadir = $(exampledir)/gcell
-ourdata_DATA = $(EXTRA_DIST)
+#dist_ourdata_SCRIPTS = fsm_utils.py
-# Make example scripts with #! executable
-install-data-local: install-ourdataDATA
- 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/michaelld/fix_local_data_install/gr-trellis/src/examples/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-trellis/src/examples/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-trellis/src/examples/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -24,30 +24,24 @@
SUBDIRS = fsm_files
ourdatadir = $(exampledir)/trellis
+
dist_ourdata_DATA = \
- README \
- fsm_utils.py \
- test_tcm.py \
- test_tcm1.py \
- test_tcm2.py \
- test_tcm_parallel.py \
- test_tcm_combined.py \
- test_sccc_hard.py \
- test_sccc_soft.py \
- test_sccc_turbo.py \
+ README
+
+dist_ourdata_SCRIPTS = \
+ fsm_utils.py \
+ test_tcm.py \
+ test_tcm1.py \
+ test_tcm2.py \
+ test_tcm_parallel.py \
+ test_tcm_combined.py \
+ test_sccc_hard.py \
+ test_sccc_soft.py \
+ test_sccc_turbo.py \
test_viterbi_equalization1.py \
test_viterbi_equalization.py \
test_turbo_equalization.py \
test_turbo_equalization1.py \
- test_turbo_equalization2.py
+ test_turbo_equalization2.py
-# Make example scripts with #! executable
-install-data-local: install-dist_ourdataDATA
- for i in `find $(dist_ourdata_DATA) -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/michaelld/fix_local_data_install/gr-trellis/src/examples/fsm_files/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-trellis/src/examples/fsm_files/Makefile.am
2009-02-26 03:56:22 UTC (rev 10519)
+++
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-trellis/src/examples/fsm_files/Makefile.am
2009-02-26 03:58:45 UTC (rev 10520)
@@ -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)/trellis/fsm_files
+
+dist_ourdata_DATA = \
awgn1o2_128.fsm \
awgn1o2_16.fsm \
awgn1o2_4.fsm \
@@ -35,7 +37,4 @@
disconnected.fsm \
rep3.fsm \
rep5.fsm \
- simple.fsm
-
-ourdatadir = $(exampledir)/trellis/fsm_files
-ourdata_DATA = $(EXTRA_DIST)
+ simple.fsm
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r10520 - in gnuradio/branches/developers/michaelld/fix_local_data_install: 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-bert gnuradio-examples/python/digital_voice gnuradio-examples/python/mp-sched gnuradio-examples/python/multi-antenna gnuradio-examples/python/multi_usrp gnuradio-examples/python/network gnuradio-examples/python/ofdm gnuradio-examples/python/usrp gnuradio-examples/python/usrp2 gr-atsc/src/python gr-gcell/src/examples gr-trellis/src/examples gr-trellis/src/examples/fsm_files,
michaelld <=