grc trellis makefile

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

diff --git a/config/grc_grc.m4 b/config/grc_grc.m4
index 140068c1b239fa77dc5784dda749fd2d438f485c..09b1a0c524bbf9f51085bb4d9fc1fe55c2016a55 100644 (file)
--- a/config/grc_grc.m4
+++ b/config/grc_grc.m4
@@ -74,6 +74,7 @@ AC_DEFUN([GRC_GRC],[
         grc/examples/usrp/Makefile \
         grc/examples/audio/Makefile \
         grc/examples/simple/Makefile \
+        grc/examples/trellis/Makefile \
         grc/Makefile \
         grc/data/Makefile \
         grc/data/platforms/Makefile \

diff --git a/grc/examples/Makefile.am b/grc/examples/Makefile.am
index 2c06367c09aa338d64c0f79d9a0ab4aa32c2629d..d129cf6baf49f7fd47e770d53c47b2a9aed68fd2 100644 (file)
--- 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 b3282479fc5d139cf724a2dca62789144678d83e..f9604c34f5bce48749ff0f5f3eaf46c823296356 100644 (file)
--- 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 b9d1b8d5685c7c00ea5802a987f1a808b5f8c6dc..e781882010d892102c51af31ecdc2ec0978f6bd1 100644 (file)
--- 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 1fb6b7742e09e3f48dfc547ce7bf18a3f9d26c04..567773052b57a0e6451bdd759fa0555f732e6a59 100644 (file)
--- 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 45cc3b74dcf5a5c23382d684a1298bc501d9099d..a74c18561d382f8f542c96d99a5372abcdfcdba8 100644 (file)
--- 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 6f75e41b84abd87ad4efd461e901645a98e22022..cfe04a54718c1141081e024451ca25b455c0f881 100644 (file)
--- 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)