diff options
| author | Johnathan Corgan | 2011-03-16 08:18:30 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2011-03-16 08:18:30 -0700 |
| commit | 4cd06fadac972d4cac559c15488bc39823063afe (patch) | |
| tree | 6fe57896bc216d8c9e672194f2e4e0e75aedb645 /gr-sounder | |
| parent | 4ad736e21f45f64fd616bb53f54e45e1c63e7330 (diff) | |
| parent | 1d70ed2bd928d52a383e688949cc7f747dd584fa (diff) | |
| download | gnuradio-4cd06fadac972d4cac559c15488bc39823063afe.tar.gz gnuradio-4cd06fadac972d4cac559c15488bc39823063afe.tar.bz2 gnuradio-4cd06fadac972d4cac559c15488bc39823063afe.zip | |
Merge remote branch 'gnuradio/next'
* gnuradio/next: (806 commits)
gruel: added missing ignores
gruel: fixed swig interface file to dereference pmt_t.
qtgui: fix distcheck error
gruel: fixing structure. Passes make check.
gruel: SWIGing Gruel into Python to access PMTs.
gnuradio-examples: add C++ audio examples using new gr-audio
created gruel/attributes.h to house compiler specific attribute macros
audio: remove obsoleted individual top-level components
gr-audio: added README and default config fix
volk: simplify the get new method for the aligned pool
grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grc
grc: swap store the subprocess object rather than the pid when executing
qtgui: removed python directory that was added, never used
uhd: use %ignore to hide warnings and fix errors
Added/updated ignore files.
Fixing gr_filter_design program to import from gnuradio Python package.
audio: high prio for platform specific audio osx
audio: added windows and osx audio source files
audio: added config checks for other audios, added jack and port
audio: make prefs look like old audio, removed old audio.py
...
Diffstat (limited to 'gr-sounder')
| -rw-r--r-- | gr-sounder/src/fpga/lib/Makefile.am | 4 | ||||
| -rw-r--r-- | gr-sounder/src/fpga/tb/Makefile.am | 4 | ||||
| -rw-r--r-- | gr-sounder/src/fpga/top/Makefile.am | 2 | ||||
| -rw-r--r-- | gr-sounder/src/python/Makefile.am | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gr-sounder/src/fpga/lib/Makefile.am b/gr-sounder/src/fpga/lib/Makefile.am index 3aae96371..a9586ebcc 100644 --- a/gr-sounder/src/fpga/lib/Makefile.am +++ b/gr-sounder/src/fpga/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007,2009 Free Software Foundation, Inc. +# Copyright 2007,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ dac_interface.v \ dacpll.v \ sounder.v \ diff --git a/gr-sounder/src/fpga/tb/Makefile.am b/gr-sounder/src/fpga/tb/Makefile.am index ec15f28d6..b21cb5f96 100644 --- a/gr-sounder/src/fpga/tb/Makefile.am +++ b/gr-sounder/src/fpga/tb/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007,2009 Free Software Foundation, Inc. +# Copyright 2007,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ sounder_tb.v \ sounder_tb.sav \ sounder_tb.sh \ diff --git a/gr-sounder/src/fpga/top/Makefile.am b/gr-sounder/src/fpga/top/Makefile.am index 63e07dc5b..f559991de 100644 --- a/gr-sounder/src/fpga/top/Makefile.am +++ b/gr-sounder/src/fpga/top/Makefile.am @@ -29,7 +29,7 @@ dist_rbf2data_DATA = $(RBFS) rbf4datadir = $(prefix)/share/usrp/rev4 dist_rbf4data_DATA = $(RBFS) -EXTRA_DIST = \ +EXTRA_DIST += \ config.vh \ usrp_sounder.v \ usrp_sounder.csf \ diff --git a/gr-sounder/src/python/Makefile.am b/gr-sounder/src/python/Makefile.am index 450c034bc..1d9b25254 100644 --- a/gr-sounder/src/python/Makefile.am +++ b/gr-sounder/src/python/Makefile.am @@ -27,7 +27,7 @@ include $(top_srcdir)/Makefile.common sounder_pythondir = $(grpythondir) -EXTRA_DIST = \ +EXTRA_DIST += \ sounder_loopback.sh \ qa_nothing.py \ run_tests.in |