[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r10529 - in gnuradio/trunk: . config gnuradio-core gnu
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r10529 - in gnuradio/trunk: . config gnuradio-core gnuradio-core/doc 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-audio-alsa gr-audio-jack gr-audio-oss gr-audio-portaudio gr-gcell/src/examples gr-gpio/src/fpga/rbf gr-gpio/src/python gr-pager/src gr-radar-mono/src/fpga/top gr-radar-mono/src/python gr-radio-astronomy/src/python gr-sounder/src/fpga/top gr-sounder/src/python gr-trellis/doc gr-trellis/src/examples gr-trellis/src/examples/fsm_files gr-wxgui pmt/src/scheme/gnuradio usrp/doc usrp/fpga/rbf usrp/fpga/rbf/rev2 us rp/fpga/rbf/rev4 |
|
Date: |
Thu, 26 Feb 2009 16:39:19 -0700 (MST) |
Author: jcorgan
Date: 2009-02-26 16:39:17 -0700 (Thu, 26 Feb 2009)
New Revision: 10529
Added:
gnuradio/trunk/usrp/fpga/rbf/rev2/Makefile.am
gnuradio/trunk/usrp/fpga/rbf/rev4/Makefile.am
Modified:
gnuradio/trunk/Makefile.am
gnuradio/trunk/Makefile.common
gnuradio/trunk/config/grc_usrp.m4
gnuradio/trunk/configure.ac
gnuradio/trunk/gnuradio-core/Makefile.am
gnuradio/trunk/gnuradio-core/doc/Makefile.am
gnuradio/trunk/gnuradio-examples/python/Makefile.am
gnuradio/trunk/gnuradio-examples/python/apps/hf_explorer/Makefile.am
gnuradio/trunk/gnuradio-examples/python/apps/hf_radio/Makefile.am
gnuradio/trunk/gnuradio-examples/python/audio/Makefile.am
gnuradio/trunk/gnuradio-examples/python/digital-bert/Makefile.am
gnuradio/trunk/gnuradio-examples/python/digital/Makefile.am
gnuradio/trunk/gnuradio-examples/python/digital_voice/Makefile.am
gnuradio/trunk/gnuradio-examples/python/mp-sched/Makefile.am
gnuradio/trunk/gnuradio-examples/python/multi-antenna/Makefile.am
gnuradio/trunk/gnuradio-examples/python/multi_usrp/Makefile.am
gnuradio/trunk/gnuradio-examples/python/network/Makefile.am
gnuradio/trunk/gnuradio-examples/python/ofdm/Makefile.am
gnuradio/trunk/gnuradio-examples/python/usrp/Makefile.am
gnuradio/trunk/gnuradio-examples/python/usrp2/Makefile.am
gnuradio/trunk/gr-atsc/src/python/Makefile.am
gnuradio/trunk/gr-audio-alsa/Makefile.am
gnuradio/trunk/gr-audio-jack/Makefile.am
gnuradio/trunk/gr-audio-oss/Makefile.am
gnuradio/trunk/gr-audio-portaudio/Makefile.am
gnuradio/trunk/gr-gcell/src/examples/Makefile.am
gnuradio/trunk/gr-gpio/src/fpga/rbf/Makefile.am
gnuradio/trunk/gr-gpio/src/python/Makefile.am
gnuradio/trunk/gr-pager/src/Makefile.am
gnuradio/trunk/gr-radar-mono/src/fpga/top/Makefile.am
gnuradio/trunk/gr-radar-mono/src/python/Makefile.am
gnuradio/trunk/gr-radio-astronomy/src/python/Makefile.am
gnuradio/trunk/gr-sounder/src/fpga/top/Makefile.am
gnuradio/trunk/gr-sounder/src/python/Makefile.am
gnuradio/trunk/gr-trellis/doc/Makefile.am
gnuradio/trunk/gr-trellis/src/examples/Makefile.am
gnuradio/trunk/gr-trellis/src/examples/fsm_files/Makefile.am
gnuradio/trunk/gr-wxgui/Makefile.am
gnuradio/trunk/pmt/src/scheme/gnuradio/Makefile.am
gnuradio/trunk/usrp/doc/Makefile.am
gnuradio/trunk/usrp/fpga/rbf/Makefile.am
gnuradio/trunk/usrp/fpga/rbf/rev2/
gnuradio/trunk/usrp/fpga/rbf/rev4/
Log:
Merged r10504:10528 from michaelld/fix_local_data_install into trunk. Trunk
passes distcheck.
Modified: gnuradio/trunk/Makefile.am
===================================================================
--- gnuradio/trunk/Makefile.am 2009-02-26 19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/Makefile.am 2009-02-26 23:39:17 UTC (rev 10529)
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2006,2008 Free Software Foundation, Inc.
+# Copyright 2001,2006,2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -28,9 +28,11 @@
configure \
configure-cell-cross \
config.h.in \
- run_tests.sh.in \
- README.hacking \
- README.building-boost
+ run_tests.sh.in
+dist_gr_doc_DATA = \
+ README \
+ README.hacking
+
SUBDIRS = @build_dirs@
DIST_SUBDIRS = @build_dirs@ @skipped_dirs@ @with_dirs@
Modified: gnuradio/trunk/Makefile.common
===================================================================
--- gnuradio/trunk/Makefile.common 2009-02-26 19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/Makefile.common 2009-02-26 23:39:17 UTC (rev 10529)
@@ -130,4 +130,5 @@
exampledir = $(datadir)/gnuradio/examples
# Base directory for documentation (docdir undefined in autoconf < 1.60)
-gr_docdir = $(if $(docdir),$(docdir),$(datadir)/doc/$(PACKAGE))-$(VERSION)
+docdir ?= $(datadir)/doc/$(PACKAGE)
+gr_docdir = $(docdir)-$(VERSION)
Modified: gnuradio/trunk/config/grc_usrp.m4
===================================================================
--- gnuradio/trunk/config/grc_usrp.m4 2009-02-26 19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/config/grc_usrp.m4 2009-02-26 23:39:17 UTC (rev 10529)
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008 Free Software
Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008,2009 Free Software
Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -107,6 +107,8 @@
usrp/firmware/src/usrp2/Makefile \
usrp/fpga/Makefile \
usrp/fpga/rbf/Makefile \
+ usrp/fpga/rbf/rev2/Makefile \
+ usrp/fpga/rbf/rev4/Makefile \
])
GRC_BUILD_CONDITIONAL(usrp)
Modified: gnuradio/trunk/configure.ac
===================================================================
--- gnuradio/trunk/configure.ac 2009-02-26 19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/configure.ac 2009-02-26 23:39:17 UTC (rev 10529)
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008 Free Software
Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008,2009 Free Software
Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -82,6 +82,7 @@
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_INSTALL
+AC_PROG_MKDIR_P
AC_PATH_PROG([RM_PROG], [rm])
AC_LIBTOOL_WIN32_DLL
@@ -308,9 +309,10 @@
AC_SUBST([skipped_dirs], [$skipped_dirs])
AC_SUBST([with_dirs], [$with_dirs])
-# fix for older autotools that don't define "abs_top_YYY" by default
+# fix for older autotools that don't define these by default
AC_SUBST(abs_top_srcdir)
AC_SUBST(abs_top_builddir)
+AC_SUBST(MKDIR_P)
# 'with' variables - the pre-installed libraries, includes, and paths
# - must always come last in the lists, so they require special
Modified: gnuradio/trunk/gnuradio-core/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/Makefile.am 2009-02-26 19:11:58 UTC (rev
10528)
+++ gnuradio/trunk/gnuradio-core/Makefile.am 2009-02-26 23:39:17 UTC (rev
10529)
@@ -22,7 +22,6 @@
include $(top_srcdir)/Makefile.common
EXTRA_DIST = \
- gnuradio-core.conf \
gnuradio-core.pc.in
SUBDIRS = src doc
@@ -31,4 +30,4 @@
pkgconfig_DATA = gnuradio-core.pc
etcdir = $(sysconfdir)/gnuradio/conf.d
-etc_DATA = gnuradio-core.conf
+dist_etc_DATA = gnuradio-core.conf
Modified: gnuradio/trunk/gnuradio-core/doc/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/doc/Makefile.am 2009-02-26 19:11:58 UTC
(rev 10528)
+++ gnuradio/trunk/gnuradio-core/doc/Makefile.am 2009-02-26 23:39:17 UTC
(rev 10529)
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2005 Free Software Foundation, Inc.
+# Copyright 2001,2005,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -23,8 +23,6 @@
SUBDIRS = other xml-swig
-EXTRA_DIST =
-
all-local: prep @generate_docs@
doc: docs # alias
@@ -33,26 +31,17 @@
@DOXYGEN@
prep:
- mkdir -p html
- mkdir -p xml
+ $(MKDIR_P) html
+ $(MKDIR_P) xml
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(gr_docdir)
- @for i in $(top_srcdir)/README $(top_srcdir)/README.hacking; do \
- echo "$(INSTALL_DATA) $$i $(DESTDIR)$(gr_docdir)"; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(gr_docdir); \
- done
+ $(MKDIR_P) $(DESTDIR)$(gr_docdir)
cp -r html $(DESTDIR)$(gr_docdir)
cp -r xml $(DESTDIR)$(gr_docdir)
uninstall-local:
- @for i in README README.hacking; do \
- echo "$(RM) $(DESTDIR)$(gr_docdir)/$$i;"; \
- $(RM) $(DESTDIR)$(gr_docdir)/$$i; \
- done
$(RM) -fr $(DESTDIR)$(gr_docdir)/html
$(RM) -fr $(DESTDIR)$(gr_docdir)/xml
clean-local:
$(RM) -fr latex html man xml
-
Modified: gnuradio/trunk/gnuradio-examples/python/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/Makefile.am 2009-02-26 19:11:58 UTC
(rev 10528)
+++ gnuradio/trunk/gnuradio-examples/python/Makefile.am 2009-02-26 23:39:17 UTC
(rev 10529)
@@ -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/trunk/gnuradio-examples/python/apps/hf_explorer/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/apps/hf_explorer/Makefile.am
2009-02-26 19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gnuradio-examples/python/apps/hf_explorer/Makefile.am
2009-02-26 23:39:17 UTC (rev 10529)
@@ -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/trunk/gnuradio-examples/python/apps/hf_radio/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/apps/hf_radio/Makefile.am
2009-02-26 19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gnuradio-examples/python/apps/hf_radio/Makefile.am
2009-02-26 23:39:17 UTC (rev 10529)
@@ -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/trunk/gnuradio-examples/python/audio/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/audio/Makefile.am 2009-02-26
19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gnuradio-examples/python/audio/Makefile.am 2009-02-26
23:39:17 UTC (rev 10529)
@@ -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/trunk/gnuradio-examples/python/digital/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/digital/Makefile.am 2009-02-26
19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gnuradio-examples/python/digital/Makefile.am 2009-02-26
23:39:17 UTC (rev 10529)
@@ -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/trunk/gnuradio-examples/python/digital-bert/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/digital-bert/Makefile.am
2009-02-26 19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gnuradio-examples/python/digital-bert/Makefile.am
2009-02-26 23:39:17 UTC (rev 10529)
@@ -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/trunk/gnuradio-examples/python/digital_voice/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/digital_voice/Makefile.am
2009-02-26 19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gnuradio-examples/python/digital_voice/Makefile.am
2009-02-26 23:39:17 UTC (rev 10529)
@@ -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/trunk/gnuradio-examples/python/mp-sched/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/mp-sched/Makefile.am
2009-02-26 19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gnuradio-examples/python/mp-sched/Makefile.am
2009-02-26 23:39:17 UTC (rev 10529)
@@ -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
Modified: gnuradio/trunk/gnuradio-examples/python/multi-antenna/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/multi-antenna/Makefile.am
2009-02-26 19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gnuradio-examples/python/multi-antenna/Makefile.am
2009-02-26 23:39:17 UTC (rev 10529)
@@ -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/trunk/gnuradio-examples/python/multi_usrp/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/multi_usrp/Makefile.am
2009-02-26 19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gnuradio-examples/python/multi_usrp/Makefile.am
2009-02-26 23:39:17 UTC (rev 10529)
@@ -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/trunk/gnuradio-examples/python/network/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/network/Makefile.am 2009-02-26
19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gnuradio-examples/python/network/Makefile.am 2009-02-26
23:39:17 UTC (rev 10529)
@@ -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/trunk/gnuradio-examples/python/ofdm/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/ofdm/Makefile.am 2009-02-26
19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gnuradio-examples/python/ofdm/Makefile.am 2009-02-26
23:39:17 UTC (rev 10529)
@@ -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/trunk/gnuradio-examples/python/usrp/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/usrp/Makefile.am 2009-02-26
19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gnuradio-examples/python/usrp/Makefile.am 2009-02-26
23:39:17 UTC (rev 10529)
@@ -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/trunk/gnuradio-examples/python/usrp2/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/usrp2/Makefile.am 2009-02-26
19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gnuradio-examples/python/usrp2/Makefile.am 2009-02-26
23:39:17 UTC (rev 10529)
@@ -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/trunk/gr-atsc/src/python/Makefile.am
===================================================================
--- gnuradio/trunk/gr-atsc/src/python/Makefile.am 2009-02-26 19:11:58 UTC
(rev 10528)
+++ gnuradio/trunk/gr-atsc/src/python/Makefile.am 2009-02-26 23:39:17 UTC
(rev 10529)
@@ -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/trunk/gr-audio-alsa/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-alsa/Makefile.am 2009-02-26 19:11:58 UTC (rev
10528)
+++ gnuradio/trunk/gr-audio-alsa/Makefile.am 2009-02-26 23:39:17 UTC (rev
10529)
@@ -1,5 +1,5 @@
#
-# Copyright 2004,2006 Free Software Foundation, Inc.
+# Copyright 2004,2006,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -22,7 +22,6 @@
include $(top_srcdir)/Makefile.common
EXTRA_DIST = \
- gr-audio-alsa.conf \
gr-audio-alsa.pc.in
SUBDIRS = src
@@ -31,4 +30,4 @@
pkgconfig_DATA = gr-audio-alsa.pc
etcdir = $(sysconfdir)/gnuradio/conf.d
-etc_DATA = gr-audio-alsa.conf
+dist_etc_DATA = gr-audio-alsa.conf
Modified: gnuradio/trunk/gr-audio-jack/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-jack/Makefile.am 2009-02-26 19:11:58 UTC (rev
10528)
+++ gnuradio/trunk/gr-audio-jack/Makefile.am 2009-02-26 23:39:17 UTC (rev
10529)
@@ -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,7 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = gr-audio-jack.conf
SUBDIRS = src
etcdir = $(sysconfdir)/gnuradio/conf.d
-etc_DATA = gr-audio-jack.conf
+dist_etc_DATA = gr-audio-jack.conf
Modified: gnuradio/trunk/gr-audio-oss/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-oss/Makefile.am 2009-02-26 19:11:58 UTC (rev
10528)
+++ gnuradio/trunk/gr-audio-oss/Makefile.am 2009-02-26 23:39:17 UTC (rev
10529)
@@ -21,10 +21,7 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = \
- gr-audio-oss.conf
-
SUBDIRS = src
etcdir = $(sysconfdir)/gnuradio/conf.d
-etc_DATA = gr-audio-oss.conf
+dist_etc_DATA = gr-audio-oss.conf
Modified: gnuradio/trunk/gr-audio-portaudio/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-portaudio/Makefile.am 2009-02-26 19:11:58 UTC
(rev 10528)
+++ gnuradio/trunk/gr-audio-portaudio/Makefile.am 2009-02-26 23:39:17 UTC
(rev 10529)
@@ -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,8 +21,7 @@
include $(top_srcdir)/Makefile.common
-EXTRA_DIST = gr-audio-portaudio.conf
SUBDIRS = src
etcdir = $(sysconfdir)/gnuradio/conf.d
-etc_DATA = gr-audio-portaudio.conf
+dist_etc_DATA = gr-audio-portaudio.conf
Modified: gnuradio/trunk/gr-gcell/src/examples/Makefile.am
===================================================================
--- gnuradio/trunk/gr-gcell/src/examples/Makefile.am 2009-02-26 19:11:58 UTC
(rev 10528)
+++ gnuradio/trunk/gr-gcell/src/examples/Makefile.am 2009-02-26 23:39:17 UTC
(rev 10529)
@@ -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/trunk/gr-gpio/src/fpga/rbf/Makefile.am
===================================================================
--- gnuradio/trunk/gr-gpio/src/fpga/rbf/Makefile.am 2009-02-26 19:11:58 UTC
(rev 10528)
+++ gnuradio/trunk/gr-gpio/src/fpga/rbf/Makefile.am 2009-02-26 23:39:17 UTC
(rev 10529)
@@ -1,5 +1,5 @@
#
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -29,9 +29,6 @@
datarev2dir = $(datadir)/rev2
datarev4dir = $(datadir)/rev4
-datarev2_DATA = $(RBFS)
+dist_datarev2_DATA = $(RBFS)
-datarev4_DATA = $(RBFS)
-
-EXTRA_DIST = \
- $(RBFS)
+dist_datarev4_DATA = $(RBFS)
Modified: gnuradio/trunk/gr-gpio/src/python/Makefile.am
===================================================================
--- gnuradio/trunk/gr-gpio/src/python/Makefile.am 2009-02-26 19:11:58 UTC
(rev 10528)
+++ gnuradio/trunk/gr-gpio/src/python/Makefile.am 2009-02-26 23:39:17 UTC
(rev 10529)
@@ -1,5 +1,5 @@
#
-# Copyright 2007,2008 Free Software Foundation, Inc.
+# Copyright 2007,2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -31,7 +31,7 @@
gpio.py
# List of python files that will be installed onto $prefix/bin
-bin_SCRIPTS = \
+dist_bin_SCRIPTS = \
gpio_rx_sfile.py \
gpio_usrp_siggen.py \
gpio_usrp_fft.py
@@ -44,7 +44,7 @@
# Programs that get run by 'make check'
TESTS = run_tests
-# Files to go into tarball not otherwise mentioned (except bin_SCRIPTS!)
-EXTRA_DIST = run_tests.in $(bin_SCRIPTS)
+# Files to go into tarball not otherwise mentioned
+EXTRA_DIST = run_tests.in
MOSTLYCLEANFILES = *.pyo *.pyc *~
Modified: gnuradio/trunk/gr-pager/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-pager/src/Makefile.am 2009-02-26 19:11:58 UTC (rev
10528)
+++ gnuradio/trunk/gr-pager/src/Makefile.am 2009-02-26 23:39:17 UTC (rev
10529)
@@ -22,13 +22,12 @@
include $(top_srcdir)/Makefile.common
EXTRA_DIST = \
- run_tests.in \
- $(bin_SCRIPTS)
+ run_tests.in
TESTS = \
run_tests
-bin_SCRIPTS = \
+dist_bin_SCRIPTS = \
usrp_flex.py \
usrp_flex_all.py \
usrp_flex_band.py
Modified: gnuradio/trunk/gr-radar-mono/src/fpga/top/Makefile.am
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/fpga/top/Makefile.am 2009-02-26
19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gr-radar-mono/src/fpga/top/Makefile.am 2009-02-26
23:39:17 UTC (rev 10529)
@@ -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,36 +21,22 @@
include $(top_srcdir)/Makefile.common
-datadir = $(prefix)/share/usrp
-
RBFS = usrp_radar_mono.rbf
+rbf2datadir = $(prefix)/share/usrp/rev2
+dist_rbf2data_DATA = $(RBFS)
+
+rbf4datadir = $(prefix)/share/usrp/rev4
+dist_rbf4data_DATA = $(RBFS)
+
EXTRA_DIST = \
usrp_radar_mono.csf \
usrp_radar_mono.esf \
usrp_radar_mono.psf \
usrp_radar_mono.qpf \
usrp_radar_mono.qsf \
- usrp_radar_mono.v \
- $(RBFS)
+ usrp_radar_mono.v
-install-data-local:
- @for file in $(RBFS); do \
- echo "$(INSTALL_DATA) $(srcdir)/$$file
$(DESTDIR)$(datadir)/rev2/$$file"; \
- $(INSTALL_DATA) $(srcdir)/$$file
$(DESTDIR)$(datadir)/rev2/$$file; \
- echo "$(INSTALL_DATA) $(srcdir)/$$file
$(DESTDIR)$(datadir)/rev4/$$file"; \
- $(INSTALL_DATA) $(srcdir)/$$file
$(DESTDIR)$(datadir)/rev4/$$file; \
- done
-
-uninstall-local:
- @for file in $(RBFS); do \
- echo "$(RM) $(DESTDIR)$(datadir)/rev2/$$file"; \
- $(RM) $(DESTDIR)$(datadir)/rev2/$$file; \
- echo "$(RM) $(DESTDIR)$(datadir)/rev4/$$file"; \
- $(RM) $(DESTDIR)$(datadir)/rev4/$$file; \
- done
-
-
MOSTLYCLEANFILES = \
db/* \
*.rpt \
Modified: gnuradio/trunk/gr-radar-mono/src/python/Makefile.am
===================================================================
--- gnuradio/trunk/gr-radar-mono/src/python/Makefile.am 2009-02-26 19:11:58 UTC
(rev 10528)
+++ gnuradio/trunk/gr-radar-mono/src/python/Makefile.am 2009-02-26 23:39:17 UTC
(rev 10529)
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -24,14 +24,10 @@
ourpythondir = $(grpythondir)
ourlibdir = $(grpyexecdir)
-EXTRA_DIST = \
- radar_mono.py \
+dist_bin_SCRIPTS = \
usrp_radar_mono.py
-bin_SCRIPTS = \
- usrp_radar_mono.py
-
-ourpython_PYTHON = \
+dist_ourpython_PYTHON = \
radar_mono.py
MOSTLYCLEANFILES = *~ *.pyc *.pyo
Modified: gnuradio/trunk/gr-radio-astronomy/src/python/Makefile.am
===================================================================
--- gnuradio/trunk/gr-radio-astronomy/src/python/Makefile.am 2009-02-26
19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gr-radio-astronomy/src/python/Makefile.am 2009-02-26
23:39:17 UTC (rev 10529)
@@ -1,5 +1,5 @@
#
-# Copyright 2004,2006 Free Software Foundation, Inc.
+# Copyright 2004,2006,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -32,11 +32,9 @@
wxguipythondir = $(grpythondir)/wxgui
wxguilibdir = $(grpyexecdir)/wxgui
-EXTRA_DIST = run_tests.in \
- usrp_ra_receiver.py \
- usrp_psr_receiver.py
+EXTRA_DIST = \
+ run_tests.in
-
TESTS = \
run_tests
@@ -54,6 +52,6 @@
# and here for applications you want installed in prefix/bin
-bin_SCRIPTS = \
+dist_bin_SCRIPTS = \
usrp_ra_receiver.py \
usrp_psr_receiver.py
Modified: gnuradio/trunk/gr-sounder/src/fpga/top/Makefile.am
===================================================================
--- gnuradio/trunk/gr-sounder/src/fpga/top/Makefile.am 2009-02-26 19:11:58 UTC
(rev 10528)
+++ gnuradio/trunk/gr-sounder/src/fpga/top/Makefile.am 2009-02-26 23:39:17 UTC
(rev 10529)
@@ -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,36 +21,22 @@
include $(top_srcdir)/Makefile.common
-datadir = $(prefix)/share/usrp
+RBFS = usrp_sounder.rbf
-RBFS = usrp_sounder.rbf
+rbf2datadir = $(prefix)/share/usrp/rev2
+dist_rbf2data_DATA = $(RBFS)
+rbf4datadir = $(prefix)/share/usrp/rev4
+dist_rbf4data_DATA = $(RBFS)
+
EXTRA_DIST = \
config.vh \
usrp_sounder.v \
usrp_sounder.csf \
usrp_sounder.esf \
usrp_sounder.psf \
- usrp_sounder.qpf \
- $(RBFS)
+ usrp_sounder.qpf
-
-install-data-local:
- @for file in $(RBFS); do \
- echo "$(INSTALL_DATA) $(srcdir)/$$file
$(DESTDIR)$(datadir)/rev2/$$file"; \
- $(INSTALL_DATA) $(srcdir)/$$file
$(DESTDIR)$(datadir)/rev2/$$file; \
- echo "$(INSTALL_DATA) $(srcdir)/$$file
$(DESTDIR)$(datadir)/rev4/$$file"; \
- $(INSTALL_DATA) $(srcdir)/$$file
$(DESTDIR)$(datadir)/rev4/$$file; \
- done
-
-uninstall-local:
- @for file in $(RBFS); do \
- echo "$(RM) $(DESTDIR)$(datadir)/rev2/$$file"; \
- $(RM) $(DESTDIR)$(datadir)/rev2/$$file; \
- echo "$(RM) $(DESTDIR)$(datadir)/rev4/$$file"; \
- $(RM) $(DESTDIR)$(datadir)/rev4/$$file; \
- done
-
MOSTLYCLEANFILES = \
db/* \
*.rpt \
@@ -61,4 +47,3 @@
*.pin \
*.sof \
*~
-
Modified: gnuradio/trunk/gr-sounder/src/python/Makefile.am
===================================================================
--- gnuradio/trunk/gr-sounder/src/python/Makefile.am 2009-02-26 19:11:58 UTC
(rev 10528)
+++ gnuradio/trunk/gr-sounder/src/python/Makefile.am 2009-02-26 23:39:17 UTC
(rev 10529)
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -29,12 +29,11 @@
ourlibdir = $(grpyexecdir)
EXTRA_DIST = \
- usrp_sounder.py \
sounder_loopback.sh \
qa_nothing.py \
run_tests.in
-bin_SCRIPTS = \
+dist_bin_SCRIPTS = \
usrp_sounder.py
ourpython_PYTHON = \
Modified: gnuradio/trunk/gr-trellis/doc/Makefile.am
===================================================================
--- gnuradio/trunk/gr-trellis/doc/Makefile.am 2009-02-26 19:11:58 UTC (rev
10528)
+++ gnuradio/trunk/gr-trellis/doc/Makefile.am 2009-02-26 23:39:17 UTC (rev
10529)
@@ -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
#
@@ -40,28 +40,19 @@
BUILT_XML_FILES =
+htmldocdir = $(gr_docdir)/html
+htmldoc_DATA = $(HTML_FILES)
+
# ----------------------------------------------------------------
gr-trellis.html : gr-trellis.xml
xmlto html-nochunks $(top_srcdir)/gr-trellis/doc/gr-trellis.xml
-# XXX `%'-style pattern rules are a GNU make extension
-%.xml : % make_numbered_listing.py
- ./make_numbered_listing.py $<
+test_tcm.py.xml : test_tcm.py make_numbered_listing.py
+ $(srcdir)/make_numbered_listing.py $<
-install-data-local:
- mkdir -p $(DESTDIR)$(gr_docdir)/html
- @for i in $(HTML_FILES); do \
- echo "$(INSTALL_DATA) $$i $(DESTDIR)$(gr_docdir)/html"; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(gr_docdir)/html; \
- done
+test_viterbi_equalization1.py.xml : test_viterbi_equalization1.py
make_numbered_listing.py
+ $(srcdir)/make_numbered_listing.py $<
-uninstall-local:
- @for i in $(HTML_FILES); do \
- echo "$(RM) $(DESTDIR)$(gr_docdir)/$$i;"; \
- $(RM) $(DESTDIR)$(gr_docdir)/$$i; \
- done
- $(RM) -fr $(DESTDIR)$(gr_docdir)/html
-
clean-local:
$(RM) -fr $(HTML_FILES) *~
Modified: gnuradio/trunk/gr-trellis/src/examples/Makefile.am
===================================================================
--- gnuradio/trunk/gr-trellis/src/examples/Makefile.am 2009-02-26 19:11:58 UTC
(rev 10528)
+++ gnuradio/trunk/gr-trellis/src/examples/Makefile.am 2009-02-26 23:39:17 UTC
(rev 10529)
@@ -1,5 +1,5 @@
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -23,34 +23,25 @@
SUBDIRS = fsm_files
-EXTRA_DIST = \
- 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 \
+ourdatadir = $(exampledir)/trellis
+
+dist_ourdata_DATA = \
+ 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
-
-ourdatadir = $(exampledir)/trellis
-ourdata_DATA = $(EXTRA_DIST)
-
-# 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/trunk/gr-trellis/src/examples/fsm_files/Makefile.am
===================================================================
--- gnuradio/trunk/gr-trellis/src/examples/fsm_files/Makefile.am
2009-02-26 19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gr-trellis/src/examples/fsm_files/Makefile.am
2009-02-26 23:39:17 UTC (rev 10529)
@@ -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
Modified: gnuradio/trunk/gr-wxgui/Makefile.am
===================================================================
--- gnuradio/trunk/gr-wxgui/Makefile.am 2009-02-26 19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/gr-wxgui/Makefile.am 2009-02-26 23:39:17 UTC (rev 10529)
@@ -22,15 +22,14 @@
include $(top_srcdir)/Makefile.common
EXTRA_DIST = \
- gr-wxgui.conf \
gr-wxgui.pc.in \
README \
README.gl
-
+
SUBDIRS = src
etcdir = $(sysconfdir)/gnuradio/conf.d
-etc_DATA = gr-wxgui.conf
+dist_etc_DATA = gr-wxgui.conf
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gr-wxgui.pc
Modified: gnuradio/trunk/pmt/src/scheme/gnuradio/Makefile.am
===================================================================
--- gnuradio/trunk/pmt/src/scheme/gnuradio/Makefile.am 2009-02-26 19:11:58 UTC
(rev 10528)
+++ gnuradio/trunk/pmt/src/scheme/gnuradio/Makefile.am 2009-02-26 23:39:17 UTC
(rev 10529)
@@ -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,12 +21,9 @@
#pkgdatadir = $(datadir)/gnuradio
EXTRA_DIST = \
- gen-serial-tags.scm \
- pmt-serial-tags.scm \
- pmt-serialize.scm
+ gen-serial-tags.scm
-
# really scheme source files
-pkgdata_DATA = \
+dist_pkgdata_DATA = \
pmt-serial-tags.scm \
pmt-serialize.scm
Modified: gnuradio/trunk/usrp/doc/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/doc/Makefile.am 2009-02-26 19:11:58 UTC (rev 10528)
+++ gnuradio/trunk/usrp/doc/Makefile.am 2009-02-26 23:39:17 UTC (rev 10529)
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2005 Free Software Foundation, Inc.
+# Copyright 2001,2005,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -25,7 +25,7 @@
SUBDIRS = other
man3dir = $(mandir)/man3
-docdir = $(prefix)/share/doc/address@hidden@
+usrp_docdir = $(prefix)/share/doc/address@hidden@
EXTRA_DIST = \
Doxyfile.in \
@@ -44,9 +44,11 @@
all-local: dox
endif
+dist_usrp_doc_DATA = $(top_srcdir)/usrp/README
+
dox: html/index.html
html/index.html:
- mkdir -p html
+ $(MKDIR_P) html
@DOXYGEN@
docbook-html: usrp_guide.html
@@ -55,25 +57,15 @@
xmlto html-nochunks $(top_srcdir)/usrp/doc/usrp_guide.xml
install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(docdir)
- @for i in $(top_srcdir)/usrp/README ; do \
- echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)"; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(docdir); \
- done
-
- mkdir -p $(DESTDIR)$(docdir)/html
+ $(MKDIR_P) $(DESTDIR)$(usrp_docdir)/html
@for i in $(DOCBOOK_HTML_FILES); do \
- echo "$(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html"; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(docdir)/html; \
+ echo "$(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html"; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(usrp_docdir)/html; \
done
- cp -r html $(DESTDIR)$(docdir)
+ cp -r html $(DESTDIR)$(usrp_docdir)
uninstall-local:
- @for i in README ChangeLog; do \
- echo "$(RM) $(DESTDIR)$(docdir)/$$i;"; \
- $(RM) $(DESTDIR)$(docdir)/$$i; \
- done
- $(RM) -fr $(DESTDIR)$(docdir)/html
+ $(RM) -fr $(DESTDIR)$(usrp_docdir)/html
clean-local:
$(RM) -fr latex html man xml $(DOCBOOK_HTML_FILES)
Modified: gnuradio/trunk/usrp/fpga/rbf/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/fpga/rbf/Makefile.am 2009-02-26 19:11:58 UTC (rev
10528)
+++ gnuradio/trunk/usrp/fpga/rbf/Makefile.am 2009-02-26 23:39:17 UTC (rev
10529)
@@ -1,5 +1,5 @@
#
-# Copyright 2005,2006 Free Software Foundation, Inc.
+# Copyright 2005,2006,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -19,35 +19,4 @@
# Boston, MA 02110-1301, USA.
#
-include $(top_srcdir)/Makefile.common
-
-datadir = $(prefix)/share/usrp
-
-rbfs = \
- rev2/std_2rxhb_2tx.rbf \
- rev2/std_4rx_0tx.rbf \
- rev2/inband_1rxhb_1tx.rbf \
- rev2/inband_2rxhb_2tx.rbf \
- rev4/std_2rxhb_2tx.rbf \
- rev4/std_4rx_0tx.rbf \
- rev4/inband_1rxhb_1tx.rbf \
- rev4/inband_2rxhb_2tx.rbf \
- rev2/multi_2rxhb_2tx.rbf \
- rev4/multi_2rxhb_2tx.rbf
-
-
-EXTRA_DIST = \
- $(rbfs)
-
-
-install-data-local:
- @for file in $(rbfs); do \
- echo "$(INSTALL_DATA) $(srcdir)/$$file
$(DESTDIR)$(datadir)/$$file"; \
- $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(datadir)/$$file; \
- done
-
-uninstall-local:
- @for file in $(rbfs); do \
- echo "$(RM) $(DESTDIR)$(datadir)/$$file"; \
- $(RM) $(DESTDIR)$(datadir)/$$file; \
- done
+SUBDIRS = rev2 rev4
Property changes on: gnuradio/trunk/usrp/fpga/rbf/rev2
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Copied: gnuradio/trunk/usrp/fpga/rbf/rev2/Makefile.am (from rev 10528,
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/fpga/rbf/rev2/Makefile.am)
===================================================================
--- gnuradio/trunk/usrp/fpga/rbf/rev2/Makefile.am
(rev 0)
+++ gnuradio/trunk/usrp/fpga/rbf/rev2/Makefile.am 2009-02-26 23:39:17 UTC
(rev 10529)
@@ -0,0 +1,31 @@
+#
+# Copyright 2009 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+rbf2datadir = $(prefix)/share/usrp/rev2
+
+dist_rbf2data_DATA = \
+ std_2rxhb_2tx.rbf \
+ std_4rx_0tx.rbf \
+ inband_1rxhb_1tx.rbf \
+ inband_2rxhb_2tx.rbf \
+ multi_2rxhb_2tx.rbf
Property changes on: gnuradio/trunk/usrp/fpga/rbf/rev4
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Copied: gnuradio/trunk/usrp/fpga/rbf/rev4/Makefile.am (from rev 10528,
gnuradio/branches/developers/michaelld/fix_local_data_install/usrp/fpga/rbf/rev4/Makefile.am)
===================================================================
--- gnuradio/trunk/usrp/fpga/rbf/rev4/Makefile.am
(rev 0)
+++ gnuradio/trunk/usrp/fpga/rbf/rev4/Makefile.am 2009-02-26 23:39:17 UTC
(rev 10529)
@@ -0,0 +1,31 @@
+#
+# Copyright 2009 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING. If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+rbf4datadir = $(prefix)/share/usrp/rev4
+
+dist_rbf4data_DATA = \
+ std_2rxhb_2tx.rbf \
+ std_4rx_0tx.rbf \
+ inband_1rxhb_1tx.rbf \
+ inband_2rxhb_2tx.rbf \
+ multi_2rxhb_2tx.rbf
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r10529 - in gnuradio/trunk: . config gnuradio-core gnuradio-core/doc 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-audio-alsa gr-audio-jack gr-audio-oss gr-audio-portaudio gr-gcell/src/examples gr-gpio/src/fpga/rbf gr-gpio/src/python gr-pager/src gr-radar-mono/src/fpga/top gr-radar-mono/src/python gr-radio-astronomy/src/python gr-sounder/src/fpga/top gr-sounder/src/python gr-trellis/doc gr-trellis/src/examples gr-trellis/src/examples/fsm_files gr-wxgui pmt/src/scheme/gnuradio usrp/doc usrp/fpga/rbf usrp/fpga/rbf/rev2 us rp/fpga/rbf/rev4,
jcorgan <=