summaryrefslogtreecommitdiff
path: root/grc/examples/Makefile.am
diff options
context:
space:
mode:
authorjblum2009-05-01 20:28:04 +0000
committerjblum2009-05-01 20:28:04 +0000
commita3ba8cf268816af51c4bb39ea7ecd7e85ea0807b (patch)
tree21dbd446e92672a56b323e005088d3c03edc238f /grc/examples/Makefile.am
parent6ce881caaacdd60a8bea37584c7286e08bea97a7 (diff)
downloadgnuradio-a3ba8cf268816af51c4bb39ea7ecd7e85ea0807b.tar.gz
gnuradio-a3ba8cf268816af51c4bb39ea7ecd7e85ea0807b.tar.bz2
gnuradio-a3ba8cf268816af51c4bb39ea7ecd7e85ea0807b.zip
Merged grc developer branch r10679:10938
Misc fixes and internal changes. Added help menu for usage tips. Added drag and drop for blocks. Removed callback controls, adopted forms. Any type can have enumerated options. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10941 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'grc/examples/Makefile.am')
-rw-r--r--grc/examples/Makefile.am40
1 files changed, 32 insertions, 8 deletions
diff --git a/grc/examples/Makefile.am b/grc/examples/Makefile.am
index d129cf6ba..9a2fbd53d 100644
--- a/grc/examples/Makefile.am
+++ b/grc/examples/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -19,11 +19,35 @@
# Boston, MA 02110-1301, USA.
#
-include $(top_srcdir)/grc/Makefile.inc
+include $(top_srcdir)/Makefile.common
-SUBDIRS = \
- audio \
- simple \
- trellis \
- usrp \
- xmlrpc
+grc_examples_prefix = $(exampledir)/grc
+
+audiodatadir = $(grc_examples_prefix)/audio
+dist_audiodata_DATA = \
+ audio/dial_tone.grc
+
+simpledatadir = $(grc_examples_prefix)/simple
+dist_simpledata_DATA = \
+ simple/ber_simulation.grc \
+ simple/dpsk_loopback.grc
+
+trellisdatadir = $(grc_examples_prefix)/trellis
+dist_trellisdata_DATA = \
+ trellis/readme.txt \
+ trellis/interference_cancellation.grc
+
+usrpdatadir = $(grc_examples_prefix)/usrp
+dist_usrpdata_DATA = \
+ usrp/usrp2_const_wave.grc \
+ usrp/usrp2_dpsk_mod.grc \
+ usrp/usrp2_fft.grc \
+ usrp/usrp_two_tone_loopback.grc \
+ usrp/usrp_wbfm_receive.grc
+
+xmlrpcdatadir = $(grc_examples_prefix)/xmlrpc
+dist_xmlrpcdata_DATA = \
+ xmlrpc/readme.txt \
+ xmlrpc/xmlrpc_client.grc \
+ xmlrpc/xmlrpc_client_script.py\
+ xmlrpc/xmlrpc_server.grc