[Commit-gnuradio] r10522 - in gnuradio/branches/developers/michaelld/fix_local_data_install: gnuradio-core gr-audio-alsa gr-audio-jack gr-audio-oss gr-audio-portaudio gr-gpio/src/fpga/rbf gr-gpio/src/python gr-pager/src gr-radar-mono/src/python gr-radio-astronomy/src/python gr-sounder/src/python gr-wxgui pmt/src/scheme/gnuradio

[michaelld]

Author: michaelld
Date: 2009-02-25 21:30:02 -0700 (Wed, 25 Feb 2009)
New Revision: 10522

Modified:
   
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-core/Makefile.am
   
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-audio-alsa/Makefile.am
   
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-audio-jack/Makefile.am
   
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-audio-oss/Makefile.am
   
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-audio-portaudio/Makefile.am
   
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-gpio/src/fpga/rbf/Makefile.am
   
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-gpio/src/python/Makefile.am
   
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-pager/src/Makefile.am
   
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-radar-mono/src/python/Makefile.am
   
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-radio-astronomy/src/python/Makefile.am
   
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-sounder/src/python/Makefile.am
   
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-wxgui/Makefile.am
   
gnuradio/branches/developers/michaelld/fix_local_data_install/pmt/src/scheme/gnuradio/Makefile.am
Log:
Moved duplicate EXTRA_DIST and %_DATA files into dist_%_DATA .



Modified: 
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-core/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-core/Makefile.am
     2009-02-26 04:27:08 UTC (rev 10521)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/gnuradio-core/Makefile.am
     2009-02-26 04:30:02 UTC (rev 10522)
@@ -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/branches/developers/michaelld/fix_local_data_install/gr-audio-alsa/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-audio-alsa/Makefile.am
     2009-02-26 04:27:08 UTC (rev 10521)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-audio-alsa/Makefile.am
     2009-02-26 04:30:02 UTC (rev 10522)
@@ -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/branches/developers/michaelld/fix_local_data_install/gr-audio-jack/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-audio-jack/Makefile.am
     2009-02-26 04:27:08 UTC (rev 10521)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-audio-jack/Makefile.am
     2009-02-26 04:30:02 UTC (rev 10522)
@@ -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/branches/developers/michaelld/fix_local_data_install/gr-audio-oss/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-audio-oss/Makefile.am
      2009-02-26 04:27:08 UTC (rev 10521)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-audio-oss/Makefile.am
      2009-02-26 04:30:02 UTC (rev 10522)
@@ -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/branches/developers/michaelld/fix_local_data_install/gr-audio-portaudio/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-audio-portaudio/Makefile.am
        2009-02-26 04:27:08 UTC (rev 10521)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-audio-portaudio/Makefile.am
        2009-02-26 04:30:02 UTC (rev 10522)
@@ -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/branches/developers/michaelld/fix_local_data_install/gr-gpio/src/fpga/rbf/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-gpio/src/fpga/rbf/Makefile.am
      2009-02-26 04:27:08 UTC (rev 10521)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-gpio/src/fpga/rbf/Makefile.am
      2009-02-26 04:30:02 UTC (rev 10522)
@@ -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/branches/developers/michaelld/fix_local_data_install/gr-gpio/src/python/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-gpio/src/python/Makefile.am
        2009-02-26 04:27:08 UTC (rev 10521)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-gpio/src/python/Makefile.am
        2009-02-26 04:30:02 UTC (rev 10522)
@@ -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/branches/developers/michaelld/fix_local_data_install/gr-pager/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-pager/src/Makefile.am
      2009-02-26 04:27:08 UTC (rev 10521)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-pager/src/Makefile.am
      2009-02-26 04:30:02 UTC (rev 10522)
@@ -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/branches/developers/michaelld/fix_local_data_install/gr-radar-mono/src/python/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-radar-mono/src/python/Makefile.am
  2009-02-26 04:27:08 UTC (rev 10521)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-radar-mono/src/python/Makefile.am
  2009-02-26 04:30:02 UTC (rev 10522)
@@ -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/branches/developers/michaelld/fix_local_data_install/gr-radio-astronomy/src/python/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-radio-astronomy/src/python/Makefile.am
     2009-02-26 04:27:08 UTC (rev 10521)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-radio-astronomy/src/python/Makefile.am
     2009-02-26 04:30:02 UTC (rev 10522)
@@ -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/branches/developers/michaelld/fix_local_data_install/gr-sounder/src/python/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-sounder/src/python/Makefile.am
     2009-02-26 04:27:08 UTC (rev 10521)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-sounder/src/python/Makefile.am
     2009-02-26 04:30:02 UTC (rev 10522)
@@ -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/branches/developers/michaelld/fix_local_data_install/gr-wxgui/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-wxgui/Makefile.am
  2009-02-26 04:27:08 UTC (rev 10521)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/gr-wxgui/Makefile.am
  2009-02-26 04:30:02 UTC (rev 10522)
@@ -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/branches/developers/michaelld/fix_local_data_install/pmt/src/scheme/gnuradio/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/michaelld/fix_local_data_install/pmt/src/scheme/gnuradio/Makefile.am
   2009-02-26 04:27:08 UTC (rev 10521)
+++ 
gnuradio/branches/developers/michaelld/fix_local_data_install/pmt/src/scheme/gnuradio/Makefile.am
   2009-02-26 04:30:02 UTC (rev 10522)
@@ -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