diff options
| author | Eric Blossom | 2010-11-12 15:42:24 -0800 |
|---|---|---|
| committer | Eric Blossom | 2010-11-12 15:42:24 -0800 |
| commit | cefeb248677decabaeccff7ba2a526343baa215a (patch) | |
| tree | 90b65d4c3e16e2af234fdf2d3486bf68d49a456b | |
| parent | d0bb24f6dd4c50569ea40fc41768ba35a4509415 (diff) | |
| download | gnuradio-cefeb248677decabaeccff7ba2a526343baa215a.tar.gz gnuradio-cefeb248677decabaeccff7ba2a526343baa215a.tar.bz2 gnuradio-cefeb248677decabaeccff7ba2a526343baa215a.zip | |
Cleanup alsa Makefile.am
| -rw-r--r-- | gr-audio-alsa/src/Makefile.am | 35 | ||||
| -rwxr-xr-x | gr-audio-alsa/src/qa_audio_alsa.py (renamed from gr-audio-alsa/src/qa_alsa.py) | 0 |
2 files changed, 20 insertions, 15 deletions
diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am index a8fcde9e5..11419d693 100644 --- a/gr-audio-alsa/src/Makefile.am +++ b/gr-audio-alsa/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2008,2009 Free Software Foundation, Inc. +# Copyright 2004,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -25,6 +25,8 @@ TESTS = EXTRA_DIST = run_tests.in run_guile_tests.in +DISTCLEANFILES = run_tests run_guile_tests + # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ audio_alsa_sink.h \ @@ -34,19 +36,16 @@ noinst_HEADERS = \ gri_alsa.h noinst_PYTHON = \ - qa_alsa.py - -if GUILE -TESTS += run_guile_tests + qa_audio_alsa.py noinst_GUILE = \ audio_alsa.test -endif + AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -################################### -# ALSA library, including OS interface, sink, and source +# ------------------------------------------------------------------------ +# ALSA C++ library, including OS interface, sink, and source lib_LTLIBRARIES = libgnuradio-audio-alsa.la @@ -61,11 +60,9 @@ libgnuradio_audio_alsa_la_LIBADD = \ libgnuradio_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) -if PYTHON -################################### -# SWIG Python interface and library -TESTS += run_tests -DISTCLEANFILES = run_tests + +# ------------------------------------------------------------------------ +# SWIG generated bindings TOP_SWIG_IFILES = \ audio_alsa.i @@ -81,6 +78,16 @@ audio_alsa_pythondir_category = \ audio_alsa_la_swig_libadd = \ libgnuradio-audio-alsa.la +if PYTHON +TESTS += run_tests +endif + +if GUILE +TESTS += run_guile_tests +endif + + +# Uses the variables above to define how to generate SWIG bindings include $(top_srcdir)/Makefile.swig # add some of the variables generated inside the Makefile.swig.gen @@ -88,5 +95,3 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) - -endif diff --git a/gr-audio-alsa/src/qa_alsa.py b/gr-audio-alsa/src/qa_audio_alsa.py index 52dbfdc7a..52dbfdc7a 100755 --- a/gr-audio-alsa/src/qa_alsa.py +++ b/gr-audio-alsa/src/qa_audio_alsa.py |