From be7c88c4f9877050d3599d62666748d0afdbc342 Mon Sep 17 00:00:00 2001 From: jblum Date: Tue, 18 Nov 2008 06:56:00 +0000 Subject: [PATCH] grc trellis makefile git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10011 221aa14e-8319-0410-a670-987f0aec2ac5 --- config/grc_grc.m4 | 1 + grc/examples/Makefile.am | 1 + grc/examples/audio/Makefile.am | 6 +----- grc/examples/simple/Makefile.am | 6 +----- grc/examples/trellis/Makefile.am | 8 +++----- grc/examples/usrp/Makefile.am | 6 +----- grc/examples/xmlrpc/Makefile.am | 6 +----- 7 files changed, 9 insertions(+), 25 deletions(-) diff --git a/config/grc_grc.m4 b/config/grc_grc.m4 index 140068c1..09b1a0c5 100644 --- 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 2c06367c..d129cf6b 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 b3282479..f9604c34 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 b9d1b8d5..e7818820 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 1fb6b774..56777305 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 45cc3b74..a74c1856 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 6f75e41b..cfe04a54 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) -- 2.47.2