diff options
| author | Nick Foster | 2011-01-10 15:25:19 -0800 |
|---|---|---|
| committer | Nick Foster | 2011-01-10 15:25:19 -0800 |
| commit | 70e978b7fdc0285b56ed3ec7be3f10dc3d922504 (patch) | |
| tree | 75231113034c1ac75277fbe444c02e9b600b2a7a /gr-usrp/src/Makefile.am | |
| parent | 0e92b93f21fc9c324c379bc318120d414e7422cc (diff) | |
| parent | bb438e7d12c5767123f8abed5810f284a5f18bf8 (diff) | |
| download | gnuradio-70e978b7fdc0285b56ed3ec7be3f10dc3d922504.tar.gz gnuradio-70e978b7fdc0285b56ed3ec7be3f10dc3d922504.tar.bz2 gnuradio-70e978b7fdc0285b56ed3ec7be3f10dc3d922504.zip | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Diffstat (limited to 'gr-usrp/src/Makefile.am')
| -rw-r--r-- | gr-usrp/src/Makefile.am | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am index db5be4ade..a0c6b7a82 100644 --- a/gr-usrp/src/Makefile.am +++ b/gr-usrp/src/Makefile.am @@ -20,15 +20,19 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig -# ---------------------------------------------------------------- -# Misc. build/installation activities - -EXTRA_DIST = run_tests.in -DISTCLEANFILES = run_tests +TESTS = +EXTRA_DIST += run_tests.in run_guile_tests.in $(nobase_guile_DATA) +DISTCLEANFILES += run_tests run_guile_tests noinst_PYTHON = qa_usrp.py +noinst_GUILE = usrp.test + +if GUILE +nobase_guile_DATA = gnuradio/usrp.scm +endif # ---------------------------------------------------------------- # The straight C++ library @@ -67,10 +71,8 @@ grinclude_HEADERS = \ usrp_source_c.h \ usrp_source_s.h -if PYTHON # ---------------------------------------------------------------- # The SWIG library -TESTS = run_tests TOP_SWIG_IFILES = \ usrp_swig.i @@ -105,11 +107,12 @@ usrp_swig_swiginclude_headers = \ usrp_sink_s.i \ usrp_standard.i -include $(top_srcdir)/Makefile.swig -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) +if PYTHON +TESTS += run_tests +endif -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +if GUILE +TESTS += run_guile_tests endif + |