summaryrefslogtreecommitdiff
path: root/grc
diff options
context:
space:
mode:
authorjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2008-08-24 19:32:13 +0000
committerjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>2008-08-24 19:32:13 +0000
commitd806988c37dcdc3e7b5cf161fdff63920961695c (patch)
tree6f9afc5fe60428ed634e72b2985f7be5c0d24656 /grc
parent651837d37aa5b7e3dd15ab355612cc17204a9548 (diff)
Fixup grc data installation. Trunk now passes distcheck again.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9398 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'grc')
-rw-r--r--grc/Makefile.am2
-rw-r--r--grc/Makefile.inc (renamed from grc/Makefile.common)13
-rw-r--r--grc/data/Makefile.am2
-rw-r--r--grc/data/grc/Makefile.am10
-rw-r--r--grc/data/grc_gnuradio/Makefile.am11
-rw-r--r--grc/data/grc_gnuradio/blocks/Makefile.am10
-rw-r--r--grc/examples/Makefile.am2
-rw-r--r--grc/examples/audio/Makefile.am10
-rw-r--r--grc/examples/simple/Makefile.am10
-rw-r--r--grc/examples/usrp/Makefile.am10
-rw-r--r--grc/examples/xmlrpc/Makefile.am12
-rw-r--r--grc/src/grc/Makefile.am2
-rw-r--r--grc/src/grc_gnuradio/Makefile.am2
13 files changed, 56 insertions, 40 deletions
diff --git a/grc/Makefile.am b/grc/Makefile.am
index 93b0a50322..5e03d62768 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.inc
index 3bad4ce04c..ce18b69110 100644
--- a/grc/Makefile.common
+++ b/grc/Makefile.inc
@@ -23,19 +23,6 @@ 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/data/Makefile.am b/grc/data/Makefile.am
index 2b0c18e8c0..7174279bae 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 54ffda91bb..f95d17c396 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 1f64722f5c..c0e98960b2 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 9906a313f4..877ed98012 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 9bba14bc95..2c06367c09 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 78800edcc6..b3282479fc 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 a2fcd614ef..b9d1b8d568 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 9ad96c915f..45cc3b74dc 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 68ecbdd9b0..6f75e41b84 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 8872c7479b..06edf26cdf 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 a2ef0f4cce..bcee51899e 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-21 10:11:45 +0000