diff options
| author | Nick Foster | 2011-04-13 17:18:14 -0700 |
|---|---|---|
| committer | Nick Foster | 2011-04-13 17:18:14 -0700 |
| commit | 9b7d444aaebbe0708e9703bce30c63b63bc81825 (patch) | |
| tree | 29121aa250decfb1ed9ca7876e1857eec8779d83 /config/Makefile.am | |
| parent | 258186d5ca2e811ced7ea637fd16e3ed3bb5573e (diff) | |
| parent | e8ff9ef4bb77517428e1208ff4b3551a38107bbd (diff) | |
| download | gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.tar.gz gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.tar.bz2 gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.zip | |
Merge branch 'master' of http://gnuradio.org/git/gnuradio into cpuid
Conflicts:
volk/Makefile.common
volk/lib/qa_utils.cc
Diffstat (limited to 'config/Makefile.am')
| -rw-r--r-- | config/Makefile.am | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index 68ff3c78c..535844507 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -51,12 +51,7 @@ m4macros = \ grc_gnuradio_examples.m4 \ grc_grc.m4 \ grc_gr_atsc.m4 \ - grc_gr_audio_alsa.m4 \ - grc_gr_audio_jack.m4 \ - grc_gr_audio_oss.m4 \ - grc_gr_audio_osx.m4 \ - grc_gr_audio_portaudio.m4 \ - grc_gr_audio_windows.m4 \ + grc_gr_audio.m4 \ grc_gr_comedi.m4 \ grc_gr_gcell.m4 \ grc_gr_gpio.m4 \ |