Fixup grc data installation. Trunk now passes distcheck again.

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

diff --git a/grc/Makefile.am b/grc/Makefile.am
index 93b0a5032208ecedd8ac8fa77050cd4536996aea..5e03d627689e53ca65337725548563976489ebd9 100644 (file)
--- a/grc/Makefile.am
+++ b/grc/Makefile.am
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
 SUBDIRS = \
        data \

diff --git a/grc/Makefile.common b/grc/Makefile.common
deleted file mode 100644 (file)
index 3bad4ce..0000000
--- a/grc/Makefile.common
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright 2008 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
-
-grc_data_prefix = @datadir@/${PACKAGE}/grc
-grc_examples_prefix = @datadir@/${PACKAGE}/examples/grc
-
-grc_data_dir = $(grc_data_prefix)/grc
-grc_gnuradio_data_dir = $(grc_data_prefix)/grc_gnuradio
-grc_gnuradio_blocks_dir = $(grc_data_prefix)/grc_gnuradio/blocks
-
-install-data-local:
-       $(mkinstalldirs) $(datadir)
-       $(foreach file, $(EXTRA_DIST), \
-               $(INSTALL_DATA) $(srcdir)/$(file) $(datadir)/$(file); \
-       )
-
-uninstall-local:
-       $(foreach file, $(EXTRA_DIST), \
-               $(RM) $(datadir)/$(file); \
-       )
-       $(RM) -fr $(datadir)

diff --git a/grc/Makefile.inc b/grc/Makefile.inc
new file mode 100644 (file)
index 0000000..ce18b69
--- /dev/null
+++ b/grc/Makefile.inc
@@ -0,0 +1,28 @@
+#
+# Copyright 2008 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
+
+grc_data_prefix = @datadir@/${PACKAGE}/grc
+grc_examples_prefix = @datadir@/${PACKAGE}/examples/grc
+grc_data_dir = $(grc_data_prefix)/grc
+grc_gnuradio_data_dir = $(grc_data_prefix)/grc_gnuradio
+grc_gnuradio_blocks_dir = $(grc_data_prefix)/grc_gnuradio/blocks

diff --git a/grc/data/Makefile.am b/grc/data/Makefile.am
index 2b0c18e8c0464f8dd786937a38e0aa733de1d73b..7174279bae132944751867e776b5a131dc138eeb 100644 (file)
--- a/grc/data/Makefile.am
+++ b/grc/data/Makefile.am
@@ -19,6 +19,6 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
 SUBDIRS = grc grc_gnuradio

diff --git a/grc/data/grc/Makefile.am b/grc/data/grc/Makefile.am
index 54ffda91bbd0f7289fb4357c7ccd441e32e4e00e..f95d17c3967f5b15d934fd0ffd52276e72694129 100644 (file)
--- a/grc/data/grc/Makefile.am
+++ b/grc/data/grc/Makefile.am
@@ -19,13 +19,17 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
-datadir = $(grc_data_dir)
+ourdatadir = $(grc_data_dir)
 
-EXTRA_DIST = \
+DATA_FILES = \
        block_tree.dtd \
        flow_graph.dtd \
        grc-icon-256.png \
        grc-icon-256.svg \
        grc-icon-32.png
+
+ourdata_DATA = $(DATA_FILES)
+
+EXTRA_DIST = $(DATA_FILES)

diff --git a/grc/data/grc_gnuradio/Makefile.am b/grc/data/grc_gnuradio/Makefile.am
index 1f64722f5cb54654641ddd12cbcf26023c361f07..c0e98960b2cf404ec62ee80975f798c53dcbc1e5 100644 (file)
--- a/grc/data/grc_gnuradio/Makefile.am
+++ b/grc/data/grc_gnuradio/Makefile.am
@@ -19,14 +19,19 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
 SUBDIRS = blocks
 
-datadir = $(grc_gnuradio_data_dir)
+ourdatadir = $(grc_gnuradio_data_dir)
 
-EXTRA_DIST = \
+DATA_FILES = \
        block.dtd \
        block_tree.xml \
        default_flow_graph.grc.xml \
        flow_graph.tmpl
+
+ourdata_DATA = $(DATA_FILES)
+
+EXTRA_DIST = $(DATA_FILES)
+

diff --git a/grc/data/grc_gnuradio/blocks/Makefile.am b/grc/data/grc_gnuradio/blocks/Makefile.am
index 9906a313f4fa1368619516fd06e8fcfb901bc040..877ed98012809e390a39e42529f7d4e8040f16b9 100644 (file)
--- a/grc/data/grc_gnuradio/blocks/Makefile.am
+++ b/grc/data/grc_gnuradio/blocks/Makefile.am
@@ -19,11 +19,11 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
-datadir = $(grc_gnuradio_blocks_dir)
+ourdatadir = $(grc_gnuradio_blocks_dir)
 
-EXTRA_DIST = \
+DATA_FILES = \
        audio_sink.xml \
        audio_source.xml \
        band_pass_filter.xml \
@@ -204,3 +204,7 @@ EXTRA_DIST = \
        wxgui_waterfallsink2.xml \
        xmlrpc_client.xml \
        xmlrpc_server.xml
+
+ourdata_DATA = $(DATA_FILES)
+
+EXTRA_DIST = $(DATA_FILES)

diff --git a/grc/examples/Makefile.am b/grc/examples/Makefile.am
index 9bba14bc95909a8d6c002b3fd843e578bc4b21ec..2c06367c09aa338d64c0f79d9a0ab4aa32c2629d 100644 (file)
--- a/grc/examples/Makefile.am
+++ b/grc/examples/Makefile.am
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
 SUBDIRS = \
        audio \

diff --git a/grc/examples/audio/Makefile.am b/grc/examples/audio/Makefile.am
index 78800edcc609acca59f29a88d205bf578f47056a..b3282479fc5d139cf724a2dca62789144678d83e 100644 (file)
--- a/grc/examples/audio/Makefile.am
+++ b/grc/examples/audio/Makefile.am
@@ -19,8 +19,12 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
-datadir = $(grc_examples_prefix)/audio
+ourdatadir = $(grc_examples_prefix)/audio
 
-EXTRA_DIST = dial_tone.grc
+DATA_FILES = dial_tone.grc
+
+ourdata_DATA = $(DATA_FILES)
+
+EXTRA_DIST = $(DATA_FILES)

diff --git a/grc/examples/simple/Makefile.am b/grc/examples/simple/Makefile.am
index a2fcd614ef4144b95041bcd6a2982bdec2da0a6b..b9d1b8d5685c7c00ea5802a987f1a808b5f8c6dc 100644 (file)
--- a/grc/examples/simple/Makefile.am
+++ b/grc/examples/simple/Makefile.am
@@ -19,8 +19,12 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
-datadir = $(grc_examples_prefix)/simple
+ourdatadir = $(grc_examples_prefix)/simple
 
-EXTRA_DIST = ber_simulation.grc
+DATA_FILES = ber_simulation.grc
+
+ourdata_DATA = $(DATA_FILES)
+
+EXTRA_DIST = $(DATA_FILES)

diff --git a/grc/examples/usrp/Makefile.am b/grc/examples/usrp/Makefile.am
index 9ad96c915fc362aaefdcba1e5439e8e15261f27b..45cc3b74dcf5a5c23382d684a1298bc501d9099d 100644 (file)
--- a/grc/examples/usrp/Makefile.am
+++ b/grc/examples/usrp/Makefile.am
@@ -19,10 +19,14 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
-datadir = $(grc_examples_prefix)/usrp
+ourdatadir = $(grc_examples_prefix)/usrp
 
-EXTRA_DIST = \
+DATA_FILES = \
        usrp_two_tone_loopback.grc \
        usrp_wbfm_receive.grc
+
+ourdata_DATA = $(DATA_FILES)
+
+EXTRA_DIST = $(DATA_FILES)

diff --git a/grc/examples/xmlrpc/Makefile.am b/grc/examples/xmlrpc/Makefile.am
index 68ecbdd9b03057ff80cf7be0e1949bb50bcab54b..6f75e41b84abd87ad4efd461e901645a98e22022 100644 (file)
--- a/grc/examples/xmlrpc/Makefile.am
+++ b/grc/examples/xmlrpc/Makefile.am
@@ -19,12 +19,16 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
-datadir = $(grc_examples_prefix)/xmlrpc
+ourdatadir = $(grc_examples_prefix)/xmlrpc
 
-EXTRA_DIST = \
+DATA_FILES = \
        readme.txt \
        xmlrpc_client.grc \
-       xmlrpc_client_script.py\ 
+       xmlrpc_client_script.py\
        xmlrpc_server.grc
+
+ourdata_DATA = $(DATA_FILES)
+
+EXTRA_DIST = $(DATA_FILES)

diff --git a/grc/src/grc/Makefile.am b/grc/src/grc/Makefile.am
index 8872c7479bb60d64395449d1bcf93c2b8a5ab7cb..06edf26cdf120e8877c5449c5c08b7df00c5fa1b 100644 (file)
--- a/grc/src/grc/Makefile.am
+++ b/grc/src/grc/Makefile.am
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
 SUBDIRS = elements gui
 

diff --git a/grc/src/grc_gnuradio/Makefile.am b/grc/src/grc_gnuradio/Makefile.am
index a2ef0f4cce8932670c92e3d6a01ff5ef57bf58c0..bcee51899e66fd22ea9ec5cd2dc2fcf5ee1a5871 100644 (file)
--- a/grc/src/grc_gnuradio/Makefile.am
+++ b/grc/src/grc_gnuradio/Makefile.am
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
 SUBDIRS = blks2 usrp utils wxgui