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-audio-osx/Makefile.am | |
| 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-audio-osx/Makefile.am')
| -rw-r--r-- | gr-audio-osx/Makefile.am | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/gr-audio-osx/Makefile.am b/gr-audio-osx/Makefile.am deleted file mode 100644 index df9c680b5..000000000 --- a/gr-audio-osx/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright 2004,2006 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -EXTRA_DIST = README_OSX -SUBDIRS = src |