Merged r10504:10528 from michaelld/fix_local_data_install into trunk. Trunk passes...

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10529 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/Makefile.am b/Makefile.am
index 9262c5bcc575dcb6753b41d0efc6c1a58f3a1303..d1c7845ed01f2376ecbc6d9ac9d7b0c4775a3954 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 @@ EXTRA_DIST = \
        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@

diff --git a/Makefile.common b/Makefile.common
index da483d1a1e5bfa5607a6e588ff32a39d57cc48e1..24ec75a37ad7d9513a738ab229aa1de48fcca420 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -130,4 +130,5 @@ COMPILE_MBH = $(RUN_GUILE) $(top_srcdir)/mblock/src/scheme/gnuradio/compile-mbh.
 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)

diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index 3708dcad0d28eeceb6c1fdb27ffab51652393c48..3b8bb28f4e6bc004642e19579c3badf15a0271b7 100644 (file)
--- a/config/grc_usrp.m4
+++ b/config/grc_usrp.m4
@@ -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 @@ AC_DEFUN([GRC_USRP],[
         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)

diff --git a/configure.ac b/configure.ac
index 3e3cbd54640afdd8c690814aec169bd7db94633b..6b6dc161dc3f0af8795d2b68e3705b7fe69401b5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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 @@ AM_PROG_AS
 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([build_dirs], [$build_dirs])
 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

diff --git a/gnuradio-core/Makefile.am b/gnuradio-core/Makefile.am
index 91537dfa475f429544b9a25536c3e299180fc232..e05a3f75be0ffde6654cd45ff3ce95af1e040463 100644 (file)
--- a/gnuradio-core/Makefile.am
+++ b/gnuradio-core/Makefile.am
@@ -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 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnuradio-core.pc
 
 etcdir = $(sysconfdir)/gnuradio/conf.d
-etc_DATA = gnuradio-core.conf
+dist_etc_DATA = gnuradio-core.conf

diff --git a/gnuradio-core/doc/Makefile.am b/gnuradio-core/doc/Makefile.am
index 1f5bef2ceade82ce3b684ca3c74c02459aa0f069..5bbd3c0cc311dc908655a1be2897b9bd52239896 100644 (file)
--- a/gnuradio-core/doc/Makefile.am
+++ b/gnuradio-core/doc/Makefile.am
@@ -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 @@ include $(top_srcdir)/Makefile.common
 
 SUBDIRS = other xml-swig
 
-EXTRA_DIST = 
-
 all-local: prep @generate_docs@
 doc: docs            # alias
 
@@ -33,26 +31,17 @@ html/index.html:
        @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
-

diff --git a/gnuradio-examples/python/Makefile.am b/gnuradio-examples/python/Makefile.am
index 068bf560d759e54e55779e13c22b1d78365d3a39..3a1acf51da21d46368a5d52edfaac999a33196f6 100644 (file)
--- 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 deb6c32d817ae27b3c3b1ed6ae123bc325f88302..88ad52128e65ed1ed906ca85976540af56c1c4e9 100644 (file)
--- 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 a6a4dfe3d3191ac647209d0b707beb4fba66308b..70b516d5dd4e4dda5761e06b8d4960242ea86577 100644 (file)
--- 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 dc200219ec92bd2421610f6ad601ee72597c242b..356b515598599905452f6ec65ee7e1c723d51470 100644 (file)
--- 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 886033792db086dd15b384f4aea055ab5ab369d3..4275af549237b0bd12c1bdb26904031af1700230 100644 (file)
--- 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 ed941e4f7871f176a083c195ae08e0f42869838c..2bc448165d5cf6832c663de83bb9af89802b03e7 100644 (file)
--- 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 08bd48821dffa71836b780c1918b1095c2140bf6..60f363b90ddee840aadbf5074f75556933deec94 100644 (file)
--- 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 bd4b4e8d4ebda874972aeea9d195452427308ba8..4fc29b0594b5662d067eca2537d58a0cb5cd893b 100644 (file)
--- 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 7e620b3ab6e952791597a2a827088c33b45aa7f2..0cb944589e331e085476b12de5fc3ae0f4382507 100644 (file)
--- 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 01119bb8a7707a9735d5ca95f9d5b24c313d1278..2ef10b6e874ef235dd066fc8db62ff59fda3f508 100644 (file)
--- 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 5786230934d30936d247f6f1a91d000e99cdd7e9..a5dddeec340bf3381c8aca5a6c351f5bbb37fb4f 100644 (file)
--- 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 c951dd16472000a4c2818aa1c7d6061212f5bd8d..a42d4017da56cea8f65b2a0f3afdf8603a004ad1 100644 (file)
--- 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 17ca7389705400bda487d820b001969efe07e530..635da3b6eabf530659f86a085674ee6bfce9f5bc 100644 (file)
--- 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 93af11675139f8fb30948251e1eff66ef5d3536f..4d2af8ee65ae76c5aa8ae86367ebaadbdf717db4 100644 (file)
--- 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

diff --git a/gr-atsc/src/python/Makefile.am b/gr-atsc/src/python/Makefile.am
index 80e4de1835e70d0e009c803517db1909e417512a..37b60e6a4ea445f6eda2e042e82f2fc08ad53cef 100644 (file)
--- a/gr-atsc/src/python/Makefile.am
+++ b/gr-atsc/src/python/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,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 \
-            $(EXAMPLE_FILES)
+EXTRA_DIST =           \
+       run_tests.in
 
 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

diff --git a/gr-audio-alsa/Makefile.am b/gr-audio-alsa/Makefile.am
index a18195d12a2a0773c354b721a42b5820cb480811..0b472f9c967cd9ae0c2858660274db8d53e34886 100644 (file)
--- a/gr-audio-alsa/Makefile.am
+++ b/gr-audio-alsa/Makefile.am
@@ -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 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gr-audio-alsa.pc
 
 etcdir = $(sysconfdir)/gnuradio/conf.d
-etc_DATA = gr-audio-alsa.conf
+dist_etc_DATA = gr-audio-alsa.conf

diff --git a/gr-audio-jack/Makefile.am b/gr-audio-jack/Makefile.am
index 799b81a760768b69aca7a7d1c2adab57766a345e..4f3a452be492cb5f69fd8b30090778429deba8f4 100644 (file)
--- a/gr-audio-jack/Makefile.am
+++ b/gr-audio-jack/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,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

diff --git a/gr-audio-oss/Makefile.am b/gr-audio-oss/Makefile.am
index 2293cd91ac7f4e834b909e513a691a9ff2dfc1b3..7b4fca6dc88a5e627679cd3e318dec87ef91b925 100644 (file)
--- a/gr-audio-oss/Makefile.am
+++ b/gr-audio-oss/Makefile.am
@@ -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

diff --git a/gr-audio-portaudio/Makefile.am b/gr-audio-portaudio/Makefile.am
index d55a301ed19e3d68b8dd870815c9b11825b52a69..bf10b39c3dc0fc0ae0fc4504ea41c2d7fee63541 100644 (file)
--- a/gr-audio-portaudio/Makefile.am
+++ b/gr-audio-portaudio/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,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

diff --git a/gr-gcell/src/examples/Makefile.am b/gr-gcell/src/examples/Makefile.am
index d10c3dad644f93f2044d8da9a8bf8fad0b890428..dc5aa3074d9638ca3b690a1be73656ef7553987b 100644 (file)
--- a/gr-gcell/src/examples/Makefile.am
+++ b/gr-gcell/src/examples/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,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)
-
-# 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
+#dist_ourdata_SCRIPTS = fsm_utils.py
 
 MOSTLYCLEANFILES = *.pyc
-

diff --git a/gr-gpio/src/fpga/rbf/Makefile.am b/gr-gpio/src/fpga/rbf/Makefile.am
index 0bc4311a15c3afde3af32b787a8c7de6ff9538df..e444d62eb614f4c80356f8358d4dc863ec224c73 100644 (file)
--- a/gr-gpio/src/fpga/rbf/Makefile.am
+++ b/gr-gpio/src/fpga/rbf/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
 # 
@@ -29,9 +29,6 @@ datadir = $(prefix)/share/usrp
 datarev2dir = $(datadir)/rev2
 datarev4dir = $(datadir)/rev4
 
-datarev2_DATA = $(RBFS)
+dist_datarev2_DATA = $(RBFS)
 
-datarev4_DATA = $(RBFS)
-
-EXTRA_DIST = \
-       $(RBFS)
+dist_datarev4_DATA = $(RBFS)

diff --git a/gr-gpio/src/python/Makefile.am b/gr-gpio/src/python/Makefile.am
index ea1a98669310f93b7dce39dd536eaa3268e62639..b61a408057b7718db8e39086aa53bdfc16f88e78 100644 (file)
--- a/gr-gpio/src/python/Makefile.am
+++ b/gr-gpio/src/python/Makefile.am
@@ -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 @@ ourpython_PYTHON =                    \
     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 @@ noinst_PYTHON =                       \
 # 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 *~

diff --git a/gr-pager/src/Makefile.am b/gr-pager/src/Makefile.am
index c7bdba17b1e951be4e548cce8172b4144403fe89..7f6f5c128229f473efbd817962de706e2efe0c8e 100644 (file)
--- a/gr-pager/src/Makefile.am
+++ b/gr-pager/src/Makefile.am
@@ -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

diff --git a/gr-radar-mono/src/fpga/top/Makefile.am b/gr-radar-mono/src/fpga/top/Makefile.am
index f964106c52e923f2eaf901362c7434c67b1eb0fa..606aa6c445bbb844865e8bd2e550dbfb8a0e444f 100644 (file)
--- a/gr-radar-mono/src/fpga/top/Makefile.am
+++ b/gr-radar-mono/src/fpga/top/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,35 +21,21 @@
 
 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)
-
-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
-
+       usrp_radar_mono.v
 
 MOSTLYCLEANFILES =     \
        db/*            \

diff --git a/gr-radar-mono/src/python/Makefile.am b/gr-radar-mono/src/python/Makefile.am
index 6cc80e9f747213c9270178f7debc8388fc6bf9a7..366e8176432969b5e1153c13dc2515683d461303 100644 (file)
--- a/gr-radar-mono/src/python/Makefile.am
+++ b/gr-radar-mono/src/python/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
 # 
@@ -24,14 +24,10 @@ include $(top_srcdir)/Makefile.common
 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

diff --git a/gr-radio-astronomy/src/python/Makefile.am b/gr-radio-astronomy/src/python/Makefile.am
index 05e3b64873024a00b9d8f3a574b1f9dc356f45bf..e8a84de61fefca7e54b924db45e0835c27452435 100644 (file)
--- a/gr-radio-astronomy/src/python/Makefile.am
+++ b/gr-radio-astronomy/src/python/Makefile.am
@@ -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,10 +32,8 @@ ourlibdir    = $(grpyexecdir)
 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 @@ wxguipython_PYTHON =                  \
 
 
 # and here for applications you want installed in prefix/bin
-bin_SCRIPTS =                          \
+dist_bin_SCRIPTS =                     \
        usrp_ra_receiver.py             \
        usrp_psr_receiver.py

diff --git a/gr-sounder/src/fpga/top/Makefile.am b/gr-sounder/src/fpga/top/Makefile.am
index 8fc3d70f5c0117892200a673ffb6e03b282d1163..33e8c860d41f97950be828aaf3f66e14a1b891ed 100644 (file)
--- a/gr-sounder/src/fpga/top/Makefile.am
+++ b/gr-sounder/src/fpga/top/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,9 +21,13 @@
 
 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               \
@@ -31,25 +35,7 @@ EXTRA_DIST =                 \
        usrp_sounder.csf        \
        usrp_sounder.esf        \
        usrp_sounder.psf        \
-       usrp_sounder.qpf        \
-       $(RBFS)
-
-
-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
+       usrp_sounder.qpf
 
 MOSTLYCLEANFILES =     \
        db/*            \
@@ -61,4 +47,3 @@ MOSTLYCLEANFILES =    \
        *.pin           \
        *.sof           \
        *~
-

diff --git a/gr-sounder/src/python/Makefile.am b/gr-sounder/src/python/Makefile.am
index cf1b5efbea6de22f181345e9260fb8a898046b1a..cec948473846240124c5f6724b592f3a0870113a 100644 (file)
--- a/gr-sounder/src/python/Makefile.am
+++ b/gr-sounder/src/python/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
 # 
@@ -29,12 +29,11 @@ ourpythondir = $(grpythondir)
 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 =     \

diff --git a/gr-trellis/doc/Makefile.am b/gr-trellis/doc/Makefile.am
index 8f6ae26047519bbd95ffda74945bbaeb26b93677..559d271dca5b0a5a0539a6a4fce26fd3118d83c7 100644 (file)
--- a/gr-trellis/doc/Makefile.am
+++ b/gr-trellis/doc/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
 # 
@@ -40,28 +40,19 @@ EXTRA_DIST = \
 
 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 $<
-
-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_tcm.py.xml : test_tcm.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
+test_viterbi_equalization1.py.xml : test_viterbi_equalization1.py make_numbered_listing.py
+       $(srcdir)/make_numbered_listing.py $<
 
 clean-local:
        $(RM) -fr $(HTML_FILES) *~

diff --git a/gr-trellis/src/examples/Makefile.am b/gr-trellis/src/examples/Makefile.am
index d1da52fbb221bd910ec6765b464964b135a5c61f..c8ba44f9c6818fc8efe9b1c8857e80b160358cae 100644 (file)
--- a/gr-trellis/src/examples/Makefile.am
+++ b/gr-trellis/src/examples/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
 # 
@@ -23,34 +23,25 @@ include $(top_srcdir)/Makefile.common
 
 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     
-
-
-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
+       test_turbo_equalization2.py
 
 MOSTLYCLEANFILES = *.pyc

diff --git a/gr-trellis/src/examples/fsm_files/Makefile.am b/gr-trellis/src/examples/fsm_files/Makefile.am
index 1414d79781d341e93ae2309d1a34b1e7aed6e2c8..c4cbb2e934864c776f5854dcc8d5ba01ed92dda4 100644 (file)
--- a/gr-trellis/src/examples/fsm_files/Makefile.am
+++ b/gr-trellis/src/examples/fsm_files/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)/trellis/fsm_files
+
+dist_ourdata_DATA =            \
        awgn1o2_128.fsm         \
        awgn1o2_16.fsm          \
        awgn1o2_4.fsm           \
@@ -35,7 +37,4 @@ EXTRA_DIST =                  \
        disconnected.fsm        \
        rep3.fsm                \
        rep5.fsm                \
-       simple.fsm              
-
-ourdatadir = $(exampledir)/trellis/fsm_files
-ourdata_DATA = $(EXTRA_DIST)
+       simple.fsm

diff --git a/gr-wxgui/Makefile.am b/gr-wxgui/Makefile.am
index cf9d6898877173e0120164427ceafef3127c5d2e..d637acb32eafacf7d6fbe50745029f63e23d493f 100644 (file)
--- a/gr-wxgui/Makefile.am
+++ b/gr-wxgui/Makefile.am
@@ -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

diff --git a/pmt/src/scheme/gnuradio/Makefile.am b/pmt/src/scheme/gnuradio/Makefile.am
index f2ae43afe316ec3e3fab034935c3205450bb8586..e83319d42123b3ed8768e55c2f7154b3c937275c 100644 (file)
--- a/pmt/src/scheme/gnuradio/Makefile.am
+++ b/pmt/src/scheme/gnuradio/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,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               

diff --git a/usrp/doc/Makefile.am b/usrp/doc/Makefile.am
index cc1f518916862f3509ce555e3385b008e18a21cf..1c01e43fad450dd21e0e7269e130ef69076573eb 100644 (file)
--- a/usrp/doc/Makefile.am
+++ b/usrp/doc/Makefile.am
@@ -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 @@ include $(top_srcdir)/Makefile.common
 SUBDIRS = other
 
 man3dir = $(mandir)/man3
-docdir  = $(prefix)/share/doc/usrp-@VERSION@
+usrp_docdir  = $(prefix)/share/doc/usrp-@VERSION@
 
 EXTRA_DIST =                   \
        Doxyfile.in             \
@@ -44,9 +44,11 @@ DOCBOOK_HTML_FILES=
 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 @@ usrp_guide.html: usrp_guide.xml
        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)

diff --git a/usrp/fpga/rbf/Makefile.am b/usrp/fpga/rbf/Makefile.am
index c7c9ce670c082e1b9181d6462234f2983b5bc491..7bce77d5ff32382c2d80fddd1f0c45381c8263b5 100644 (file)
--- a/usrp/fpga/rbf/Makefile.am
+++ b/usrp/fpga/rbf/Makefile.am
@@ -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

diff --git a/usrp/fpga/rbf/rev2/Makefile.am b/usrp/fpga/rbf/rev2/Makefile.am
new file mode 100644 (file)
index 0000000..487650e
--- /dev/null
+++ b/usrp/fpga/rbf/rev2/Makefile.am
@@ -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

diff --git a/usrp/fpga/rbf/rev4/Makefile.am b/usrp/fpga/rbf/rev4/Makefile.am
new file mode 100644 (file)
index 0000000..54de9b8
--- /dev/null
+++ b/usrp/fpga/rbf/rev4/Makefile.am
@@ -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