From d601eb214a5c5e647134f7a43c5d0fa83c3488a4 Mon Sep 17 00:00:00 2001 From: jblum Date: Wed, 17 Sep 2008 14:34:27 +0000 Subject: [PATCH] replaced EXTRA_DIST with dist_ prefix git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9600 221aa14e-8319-0410-a670-987f0aec2ac5 --- grc/data/platforms/base/Makefile.am | 4 +--- grc/data/platforms/python/Makefile.am | 5 +---- grc/data/platforms/python/blocks/Makefile.am | 4 +--- grc/scripts/Makefile.am | 4 +--- grc/src/platforms/base/Makefile.am | 2 +- grc/src/platforms/python/Makefile.am | 2 +- 6 files changed, 6 insertions(+), 15 deletions(-) diff --git a/grc/data/platforms/base/Makefile.am b/grc/data/platforms/base/Makefile.am index 24f6f16d..56ff5939 100644 --- 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 12e747fa..45783dfb 100644 --- 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 b8e48d7a..806c56bd 100644 --- 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 27a77b18..d3c08eb7 100644 --- 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 dca53b8b..a40d8c5b 100644 --- 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 e5845d0e..13b5f77d 100644 --- 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) -- 2.47.2