[Commit-gnuradio] r9398 - in gnuradio/trunk/grc: . data data/grc data/gr

commit-gnuradio

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r9398 - in gnuradio/trunk/grc: . data data/grc data/gr

From:	jcorgan
Subject:	[Commit-gnuradio] r9398 - in gnuradio/trunk/grc: . data data/grc data/grc_gnuradio data/grc_gnuradio/blocks examples examples/audio examples/simple examples/usrp examples/xmlrpc src/grc src/grc_gnuradio
Date:	Sun, 24 Aug 2008 13:32:13 -0600 (MDT)

Author: jcorgan
Date: 2008-08-24 13:32:13 -0600 (Sun, 24 Aug 2008)
New Revision: 9398

Added:
   gnuradio/trunk/grc/Makefile.inc
Removed:
   gnuradio/trunk/grc/Makefile.common
Modified:
   gnuradio/trunk/grc/Makefile.am
   gnuradio/trunk/grc/data/Makefile.am
   gnuradio/trunk/grc/data/grc/Makefile.am
   gnuradio/trunk/grc/data/grc_gnuradio/Makefile.am
   gnuradio/trunk/grc/data/grc_gnuradio/blocks/Makefile.am
   gnuradio/trunk/grc/examples/Makefile.am
   gnuradio/trunk/grc/examples/audio/Makefile.am
   gnuradio/trunk/grc/examples/simple/Makefile.am
   gnuradio/trunk/grc/examples/usrp/Makefile.am
   gnuradio/trunk/grc/examples/xmlrpc/Makefile.am
   gnuradio/trunk/grc/src/grc/Makefile.am
   gnuradio/trunk/grc/src/grc_gnuradio/Makefile.am
Log:
Fixup grc data installation. Trunk now passes distcheck again.

Modified: gnuradio/trunk/grc/Makefile.am
===================================================================
--- gnuradio/trunk/grc/Makefile.am      2008-08-24 18:22:50 UTC (rev 9397)
+++ gnuradio/trunk/grc/Makefile.am      2008-08-24 19:32:13 UTC (rev 9398)
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
 SUBDIRS = \
        data \

Deleted: gnuradio/trunk/grc/Makefile.common

Copied: gnuradio/trunk/grc/Makefile.inc (from rev 9383, 
gnuradio/trunk/grc/Makefile.common)
===================================================================
--- gnuradio/trunk/grc/Makefile.inc                             (rev 0)
+++ gnuradio/trunk/grc/Makefile.inc     2008-08-24 19:32:13 UTC (rev 9398)
@@ -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

Modified: gnuradio/trunk/grc/data/Makefile.am
===================================================================
--- gnuradio/trunk/grc/data/Makefile.am 2008-08-24 18:22:50 UTC (rev 9397)
+++ gnuradio/trunk/grc/data/Makefile.am 2008-08-24 19:32:13 UTC (rev 9398)
@@ -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

Modified: gnuradio/trunk/grc/data/grc/Makefile.am
===================================================================
--- gnuradio/trunk/grc/data/grc/Makefile.am     2008-08-24 18:22:50 UTC (rev 
9397)
+++ gnuradio/trunk/grc/data/grc/Makefile.am     2008-08-24 19:32:13 UTC (rev 
9398)
@@ -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)

Modified: gnuradio/trunk/grc/data/grc_gnuradio/Makefile.am
===================================================================
--- gnuradio/trunk/grc/data/grc_gnuradio/Makefile.am    2008-08-24 18:22:50 UTC 
(rev 9397)
+++ gnuradio/trunk/grc/data/grc_gnuradio/Makefile.am    2008-08-24 19:32:13 UTC 
(rev 9398)
@@ -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)
+

Modified: gnuradio/trunk/grc/data/grc_gnuradio/blocks/Makefile.am
===================================================================
--- gnuradio/trunk/grc/data/grc_gnuradio/blocks/Makefile.am     2008-08-24 
18:22:50 UTC (rev 9397)
+++ gnuradio/trunk/grc/data/grc_gnuradio/blocks/Makefile.am     2008-08-24 
19:32:13 UTC (rev 9398)
@@ -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 @@
        wxgui_waterfallsink2.xml \
        xmlrpc_client.xml \
        xmlrpc_server.xml
+
+ourdata_DATA = $(DATA_FILES)
+
+EXTRA_DIST = $(DATA_FILES)

Modified: gnuradio/trunk/grc/examples/Makefile.am
===================================================================
--- gnuradio/trunk/grc/examples/Makefile.am     2008-08-24 18:22:50 UTC (rev 
9397)
+++ gnuradio/trunk/grc/examples/Makefile.am     2008-08-24 19:32:13 UTC (rev 
9398)
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
 SUBDIRS = \
        audio \

Modified: gnuradio/trunk/grc/examples/audio/Makefile.am
===================================================================
--- gnuradio/trunk/grc/examples/audio/Makefile.am       2008-08-24 18:22:50 UTC 
(rev 9397)
+++ gnuradio/trunk/grc/examples/audio/Makefile.am       2008-08-24 19:32:13 UTC 
(rev 9398)
@@ -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)

Modified: gnuradio/trunk/grc/examples/simple/Makefile.am
===================================================================
--- gnuradio/trunk/grc/examples/simple/Makefile.am      2008-08-24 18:22:50 UTC 
(rev 9397)
+++ gnuradio/trunk/grc/examples/simple/Makefile.am      2008-08-24 19:32:13 UTC 
(rev 9398)
@@ -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)

Modified: gnuradio/trunk/grc/examples/usrp/Makefile.am
===================================================================
--- gnuradio/trunk/grc/examples/usrp/Makefile.am        2008-08-24 18:22:50 UTC 
(rev 9397)
+++ gnuradio/trunk/grc/examples/usrp/Makefile.am        2008-08-24 19:32:13 UTC 
(rev 9398)
@@ -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)

Modified: gnuradio/trunk/grc/examples/xmlrpc/Makefile.am
===================================================================
--- gnuradio/trunk/grc/examples/xmlrpc/Makefile.am      2008-08-24 18:22:50 UTC 
(rev 9397)
+++ gnuradio/trunk/grc/examples/xmlrpc/Makefile.am      2008-08-24 19:32:13 UTC 
(rev 9398)
@@ -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)

Modified: gnuradio/trunk/grc/src/grc/Makefile.am
===================================================================
--- gnuradio/trunk/grc/src/grc/Makefile.am      2008-08-24 18:22:50 UTC (rev 
9397)
+++ gnuradio/trunk/grc/src/grc/Makefile.am      2008-08-24 19:32:13 UTC (rev 
9398)
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-include $(top_srcdir)/grc/Makefile.common
+include $(top_srcdir)/grc/Makefile.inc
 
 SUBDIRS = elements gui
 

Modified: gnuradio/trunk/grc/src/grc_gnuradio/Makefile.am
===================================================================
--- gnuradio/trunk/grc/src/grc_gnuradio/Makefile.am     2008-08-24 18:22:50 UTC 
(rev 9397)
+++ gnuradio/trunk/grc/src/grc_gnuradio/Makefile.am     2008-08-24 19:32:13 UTC 
(rev 9398)
@@ -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

[Prev in Thread]

Current Thread

[Next in Thread]

[Commit-gnuradio] r9398 - in gnuradio/trunk/grc: . data data/grc data/grc_gnuradio data/grc_gnuradio/blocks examples examples/audio examples/simple examples/usrp examples/xmlrpc src/grc src/grc_gnuradio, jcorgan <=

Prev by Date: [Commit-gnuradio] r9397 - gnuradio/trunk/gnuradio-core/src/lib/general
Next by Date: [Commit-gnuradio] r9399 - in gnuradio/trunk: config gnuradio-core/doc
Previous by thread: [Commit-gnuradio] r9397 - gnuradio/trunk/gnuradio-core/src/lib/general
Next by thread: [Commit-gnuradio] r9399 - in gnuradio/trunk: config gnuradio-core/doc
Index(es):
- Date
- Thread