From: jcorgan Date: Sun, 24 Aug 2008 19:32:13 +0000 (+0000) Subject: Fixup grc data installation. Trunk now passes distcheck again. X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=d806988c37dcdc3e7b5cf161fdff63920961695c;p=debian%2Fgnuradio 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 93b0a503..5e03d627 100644 --- 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 index 3bad4ce0..00000000 --- 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 index 00000000..ce18b691 --- /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 2b0c18e8..7174279b 100644 --- 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 54ffda91..f95d17c3 100644 --- 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 1f64722f..c0e98960 100644 --- 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 9906a313..877ed980 100644 --- 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 9bba14bc..2c06367c 100644 --- 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 78800edc..b3282479 100644 --- 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 a2fcd614..b9d1b8d5 100644 --- 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 9ad96c91..45cc3b74 100644 --- 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 68ecbdd9..6f75e41b 100644 --- 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 8872c747..06edf26c 100644 --- 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 a2ef0f4c..bcee5189 100644 --- 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