grc trellis makefile

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

6 files changed, 8 insertions, 25 deletions

diff --git a/grc/examples/Makefile.am b/grc/examples/Makefile.am
index 2c06367c0..d129cf6ba 100644
--- a/grc/examples/Makefile.am
+++ b/grc/examples/Makefile.am
@@ -24,5 +24,6 @@ include $(top_srcdir)/grc/Makefile.inc
 SUBDIRS = \
 	audio \
 	simple \
+	trellis \
 	usrp \
 	xmlrpc
diff --git a/grc/examples/audio/Makefile.am b/grc/examples/audio/Makefile.am
index b3282479f..f9604c34f 100644
--- a/grc/examples/audio/Makefile.am
+++ b/grc/examples/audio/Makefile.am
@@ -23,8 +23,4 @@ include $(top_srcdir)/grc/Makefile.inc
 
 ourdatadir = $(grc_examples_prefix)/audio
 
-DATA_FILES = dial_tone.grc
-
-ourdata_DATA = $(DATA_FILES)
-
-EXTRA_DIST = $(DATA_FILES)
+dist_ourdata_DATA = dial_tone.grc
diff --git a/grc/examples/simple/Makefile.am b/grc/examples/simple/Makefile.am
index b9d1b8d56..e78188201 100644
--- a/grc/examples/simple/Makefile.am
+++ b/grc/examples/simple/Makefile.am
@@ -23,8 +23,4 @@ include $(top_srcdir)/grc/Makefile.inc
 
 ourdatadir = $(grc_examples_prefix)/simple
 
-DATA_FILES = ber_simulation.grc
-
-ourdata_DATA = $(DATA_FILES)
-
-EXTRA_DIST = $(DATA_FILES)
+dist_ourdata_DATA = ber_simulation.grc
diff --git a/grc/examples/trellis/Makefile.am b/grc/examples/trellis/Makefile.am
index 1fb6b7742..567773052 100644
--- a/grc/examples/trellis/Makefile.am
+++ b/grc/examples/trellis/Makefile.am
@@ -23,8 +23,6 @@ include $(top_srcdir)/grc/Makefile.inc
 
 ourdatadir = $(grc_examples_prefix)/trellis
 
-DATA_FILES = interference_cancellation.grc
-
-ourdata_DATA = $(DATA_FILES)
-
-EXTRA_DIST = $(DATA_FILES)
+dist_ourdata_DATA = \
+	readme.txt \
+	interference_cancellation.grc
diff --git a/grc/examples/usrp/Makefile.am b/grc/examples/usrp/Makefile.am
index 45cc3b74d..a74c18561 100644
--- a/grc/examples/usrp/Makefile.am
+++ b/grc/examples/usrp/Makefile.am
@@ -23,10 +23,6 @@ include $(top_srcdir)/grc/Makefile.inc
 
 ourdatadir = $(grc_examples_prefix)/usrp
 
-DATA_FILES = \
+dist_ourdata_DATA = \
 	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 6f75e41b8..cfe04a547 100644
--- a/grc/examples/xmlrpc/Makefile.am
+++ b/grc/examples/xmlrpc/Makefile.am
@@ -23,12 +23,8 @@ include $(top_srcdir)/grc/Makefile.inc
 
 ourdatadir = $(grc_examples_prefix)/xmlrpc
 
-DATA_FILES = \
+dist_ourdata_DATA = \
 	readme.txt \
 	xmlrpc_client.grc \
 	xmlrpc_client_script.py\
 	xmlrpc_server.grc
-
-ourdata_DATA = $(DATA_FILES)
-
-EXTRA_DIST = $(DATA_FILES)