diff options
| author | Josh Blum | 2011-03-09 11:28:09 -0800 |
|---|---|---|
| committer | Josh Blum | 2011-03-09 11:28:09 -0800 |
| commit | 6d1d64ebacc156f4df5401dac427b316dd22265d (patch) | |
| tree | dac9437f3121c8f56dc1188ce2948c6a9c96ada9 /gr-audio/lib | |
| parent | 4cba8db90fe1412232a4c1a20d834f6ce606baf0 (diff) | |
| download | gnuradio-6d1d64ebacc156f4df5401dac427b316dd22265d.tar.gz gnuradio-6d1d64ebacc156f4df5401dac427b316dd22265d.tar.bz2 gnuradio-6d1d64ebacc156f4df5401dac427b316dd22265d.zip | |
audio: moved alsa support files into subdirectory
Diffstat (limited to 'gr-audio/lib')
| -rw-r--r-- | gr-audio/lib/Makefile.am | 18 | ||||
| -rw-r--r-- | gr-audio/lib/alsa/audio_alsa_sink.cc (renamed from gr-audio/lib/audio_alsa_sink.cc) | 0 | ||||
| -rw-r--r-- | gr-audio/lib/alsa/audio_alsa_sink.h (renamed from gr-audio/lib/audio_alsa_sink.h) | 0 | ||||
| -rw-r--r-- | gr-audio/lib/alsa/audio_alsa_source.cc (renamed from gr-audio/lib/audio_alsa_source.cc) | 0 | ||||
| -rw-r--r-- | gr-audio/lib/alsa/audio_alsa_source.h (renamed from gr-audio/lib/audio_alsa_source.h) | 0 | ||||
| -rw-r--r-- | gr-audio/lib/alsa/gr-audio-alsa.conf (renamed from gr-audio/lib/gr-audio-alsa.conf) | 0 | ||||
| -rw-r--r-- | gr-audio/lib/alsa/gri_alsa.cc (renamed from gr-audio/lib/gri_alsa.cc) | 0 | ||||
| -rw-r--r-- | gr-audio/lib/alsa/gri_alsa.h (renamed from gr-audio/lib/gri_alsa.h) | 0 |
8 files changed, 10 insertions, 8 deletions
diff --git a/gr-audio/lib/Makefile.am b/gr-audio/lib/Makefile.am index 7d9e419a8..995cfec88 100644 --- a/gr-audio/lib/Makefile.am +++ b/gr-audio/lib/Makefile.am @@ -47,20 +47,22 @@ dist_etc_DATA = gr-audio.conf ######################################################################## if GR_AUDIO_ALSA_SUPPORT -AM_CPPFLAGS += $(ALSA_CPPFLAGS) +AM_CPPFLAGS += \ + -I$(srcdir)/alsa \ + $(ALSA_CPPFLAGS) libgnuradio_audio_la_LIBADD += $(ALSA_LIBS) libgnuradio_audio_la_SOURCES += \ - gri_alsa.cc \ - audio_alsa_source.cc \ - audio_alsa_sink.cc + alsa/gri_alsa.cc \ + alsa/audio_alsa_source.cc \ + alsa/audio_alsa_sink.cc noinst_HEADERS += \ - gri_alsa.h \ - audio_alsa_source.h \ - audio_alsa_sink.h + alsa/gri_alsa.h \ + alsa/audio_alsa_source.h \ + alsa/audio_alsa_sink.h -dist_etc_DATA += gr-audio-alsa.conf +dist_etc_DATA += alsa/gr-audio-alsa.conf endif diff --git a/gr-audio/lib/audio_alsa_sink.cc b/gr-audio/lib/alsa/audio_alsa_sink.cc index af5cc02be..af5cc02be 100644 --- a/gr-audio/lib/audio_alsa_sink.cc +++ b/gr-audio/lib/alsa/audio_alsa_sink.cc diff --git a/gr-audio/lib/audio_alsa_sink.h b/gr-audio/lib/alsa/audio_alsa_sink.h index 23e406d6b..23e406d6b 100644 --- a/gr-audio/lib/audio_alsa_sink.h +++ b/gr-audio/lib/alsa/audio_alsa_sink.h diff --git a/gr-audio/lib/audio_alsa_source.cc b/gr-audio/lib/alsa/audio_alsa_source.cc index a8667361e..a8667361e 100644 --- a/gr-audio/lib/audio_alsa_source.cc +++ b/gr-audio/lib/alsa/audio_alsa_source.cc diff --git a/gr-audio/lib/audio_alsa_source.h b/gr-audio/lib/alsa/audio_alsa_source.h index e38af3872..e38af3872 100644 --- a/gr-audio/lib/audio_alsa_source.h +++ b/gr-audio/lib/alsa/audio_alsa_source.h diff --git a/gr-audio/lib/gr-audio-alsa.conf b/gr-audio/lib/alsa/gr-audio-alsa.conf index 5cec63e7a..5cec63e7a 100644 --- a/gr-audio/lib/gr-audio-alsa.conf +++ b/gr-audio/lib/alsa/gr-audio-alsa.conf diff --git a/gr-audio/lib/gri_alsa.cc b/gr-audio/lib/alsa/gri_alsa.cc index d9fda0f7d..d9fda0f7d 100644 --- a/gr-audio/lib/gri_alsa.cc +++ b/gr-audio/lib/alsa/gri_alsa.cc diff --git a/gr-audio/lib/gri_alsa.h b/gr-audio/lib/alsa/gri_alsa.h index 3d72fd950..3d72fd950 100644 --- a/gr-audio/lib/gri_alsa.h +++ b/gr-audio/lib/alsa/gri_alsa.h |