replaced EXTRA_DIST with dist_ prefix

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

diff --git a/grc/data/platforms/base/Makefile.am b/grc/data/platforms/base/Makefile.am
index 24f6f16d11564d8f85894219cd483c1c4b7c8b3f..56ff5939c893835fc735262f9419bcceb3bb7c7e 100644 (file)
--- a/grc/data/platforms/base/Makefile.am
+++ b/grc/data/platforms/base/Makefile.am
@@ -23,11 +23,9 @@ include $(top_srcdir)/grc/Makefile.inc
 
 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)

diff --git a/grc/data/platforms/python/Makefile.am b/grc/data/platforms/python/Makefile.am
index 12e747faf4e7ae8e8df16bffb7222e32deafa8e9..45783dfba07b66b548ca389d23a7d1000098edeb 100644 (file)
--- a/grc/data/platforms/python/Makefile.am
+++ b/grc/data/platforms/python/Makefile.am
@@ -25,11 +25,8 @@ SUBDIRS = blocks
 
 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)
-

diff --git a/grc/data/platforms/python/blocks/Makefile.am b/grc/data/platforms/python/blocks/Makefile.am
index b8e48d7a895f5a284a7ac7aa5a6c99d37f02ccd6..806c56bdeabb80dea33366c11468e5aa0c9bde6f 100644 (file)
--- a/grc/data/platforms/python/blocks/Makefile.am
+++ b/grc/data/platforms/python/blocks/Makefile.am
@@ -23,7 +23,7 @@ include $(top_srcdir)/grc/Makefile.inc
 
 ourdatadir = $(grc_python_blocks_dir)
 
-ourdata_DATA = \
+dist_ourdata_DATA = \
        audio_sink.xml \
        audio_source.xml \
        band_pass_filter.xml \
@@ -204,5 +204,3 @@ ourdata_DATA = \
        wxgui_waterfallsink2.xml \
        xmlrpc_client.xml \
        xmlrpc_server.xml
-
-EXTRA_DIST = $(ourdata_DATA)

diff --git a/grc/scripts/Makefile.am b/grc/scripts/Makefile.am
index 27a77b18ba4f87e9dbecfe7978109018befb8170..d3c08eb704ba3e9c1651529a1a8e5cccb2cf2a2e 100644 (file)
--- a/grc/scripts/Makefile.am
+++ b/grc/scripts/Makefile.am
@@ -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

diff --git a/grc/src/platforms/base/Makefile.am b/grc/src/platforms/base/Makefile.am
index dca53b8b5716714ba35090aab534d02e8ebe63db..a40d8c5bb574a6686ca541de948b8a0ac06f4bc2 100644 (file)
--- a/grc/src/platforms/base/Makefile.am
+++ b/grc/src/platforms/base/Makefile.am
@@ -42,6 +42,6 @@ Constants.py: Makefile $(srcdir)/Constants.py.in
                -e 's|@datadir[@]|$(grc_base_data_dir)|g' \
        $(srcdir)/Constants.py.in > $@
 
-EXTRA_DIST = Constants.py.in
+EXTRA_DIST = $(srcdir)/Constants.py.in
 
 MOSTLYCLEANFILES = $(BUILT_SOURCES)

diff --git a/grc/src/platforms/python/Makefile.am b/grc/src/platforms/python/Makefile.am
index e5845d0ec081b962f585969acfa1897fb3649cd0..13b5f77d854de640a722f23b8621b1a45c60582c 100644 (file)
--- a/grc/src/platforms/python/Makefile.am
+++ b/grc/src/platforms/python/Makefile.am
@@ -46,6 +46,6 @@ Constants.py: Makefile $(srcdir)/Constants.py.in
                -e 's|@docdir[@]|$(gr_docdir)|g' \
        $(srcdir)/Constants.py.in > $@
 
-EXTRA_DIST = Constants.py.in
+EXTRA_DIST = $(srcdir)/Constants.py.in
 
 MOSTLYCLEANFILES = $(BUILT_SOURCES)