[Commit-gnuradio] r9600 - in gnuradio/trunk/grc: data/platforms/base data/platforms/python data/platforms/python/blocks scripts src/platforms/base src/platforms/python

[jblum]

Author: jblum
Date: 2008-09-17 08:34:27 -0600 (Wed, 17 Sep 2008)
New Revision: 9600

Modified:
   gnuradio/trunk/grc/data/platforms/base/Makefile.am
   gnuradio/trunk/grc/data/platforms/python/Makefile.am
   gnuradio/trunk/grc/data/platforms/python/blocks/Makefile.am
   gnuradio/trunk/grc/scripts/Makefile.am
   gnuradio/trunk/grc/src/platforms/base/Makefile.am
   gnuradio/trunk/grc/src/platforms/python/Makefile.am
Log:
replaced EXTRA_DIST with dist_ prefix

Modified: gnuradio/trunk/grc/data/platforms/base/Makefile.am
===================================================================
--- gnuradio/trunk/grc/data/platforms/base/Makefile.am  2008-09-17 14:28:14 UTC 
(rev 9599)
+++ gnuradio/trunk/grc/data/platforms/base/Makefile.am  2008-09-17 14:34:27 UTC 
(rev 9600)
@@ -23,11 +23,9 @@
 
 ourdatadir = $(grc_base_data_dir)
 
-ourdata_DATA = \
+dist_ourdata_DATA = \
        block_tree.dtd \
        flow_graph.dtd \
        grc-icon-256.png \
        grc-icon-256.svg \
        grc-icon-32.png
-
-EXTRA_DIST = $(ourdata_DATA)

Modified: gnuradio/trunk/grc/data/platforms/python/Makefile.am
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/Makefile.am        2008-09-17 
14:28:14 UTC (rev 9599)
+++ gnuradio/trunk/grc/data/platforms/python/Makefile.am        2008-09-17 
14:34:27 UTC (rev 9600)
@@ -25,11 +25,8 @@
 
 ourdatadir = $(grc_python_data_dir)
 
-ourdata_DATA = \
+dist_ourdata_DATA = \
        block.dtd \
        block_tree.xml \
        default_flow_graph.grc \
        flow_graph.tmpl
-
-EXTRA_DIST = $(ourdata_DATA)
-

Modified: gnuradio/trunk/grc/data/platforms/python/blocks/Makefile.am
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/Makefile.am 2008-09-17 
14:28:14 UTC (rev 9599)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/Makefile.am 2008-09-17 
14:34:27 UTC (rev 9600)
@@ -23,7 +23,7 @@
 
 ourdatadir = $(grc_python_blocks_dir)
 
-ourdata_DATA = \
+dist_ourdata_DATA = \
        audio_sink.xml \
        audio_source.xml \
        band_pass_filter.xml \
@@ -204,5 +204,3 @@
        wxgui_waterfallsink2.xml \
        xmlrpc_client.xml \
        xmlrpc_server.xml
-
-EXTRA_DIST = $(ourdata_DATA)

Modified: gnuradio/trunk/grc/scripts/Makefile.am
===================================================================
--- gnuradio/trunk/grc/scripts/Makefile.am      2008-09-17 14:28:14 UTC (rev 
9599)
+++ gnuradio/trunk/grc/scripts/Makefile.am      2008-09-17 14:34:27 UTC (rev 
9600)
@@ -21,6 +21,4 @@
 
 include $(top_srcdir)/grc/Makefile.inc
 
-EXTRA_DIST = $(bin_SCRIPTS)
-
-bin_SCRIPTS = grc usrp_diagnostics
+dist_bin_SCRIPTS = grc usrp_diagnostics

Modified: gnuradio/trunk/grc/src/platforms/base/Makefile.am
===================================================================
--- gnuradio/trunk/grc/src/platforms/base/Makefile.am   2008-09-17 14:28:14 UTC 
(rev 9599)
+++ gnuradio/trunk/grc/src/platforms/base/Makefile.am   2008-09-17 14:34:27 UTC 
(rev 9600)
@@ -42,6 +42,6 @@
                -e 's|@address@hidden|$(grc_base_data_dir)|g' \
        $(srcdir)/Constants.py.in > $@
 
-EXTRA_DIST = Constants.py.in
+EXTRA_DIST = $(srcdir)/Constants.py.in
 
 MOSTLYCLEANFILES = $(BUILT_SOURCES)

Modified: gnuradio/trunk/grc/src/platforms/python/Makefile.am
===================================================================
--- gnuradio/trunk/grc/src/platforms/python/Makefile.am 2008-09-17 14:28:14 UTC 
(rev 9599)
+++ gnuradio/trunk/grc/src/platforms/python/Makefile.am 2008-09-17 14:34:27 UTC 
(rev 9600)
@@ -46,6 +46,6 @@
                -e 's|@address@hidden|$(gr_docdir)|g' \
        $(srcdir)/Constants.py.in > $@
 
-EXTRA_DIST = Constants.py.in
+EXTRA_DIST = $(srcdir)/Constants.py.in
 
 MOSTLYCLEANFILES = $(BUILT_SOURCES)