diff options
| author | Eric Blossom <eb@comsec.com> | 2010-11-24 17:29:11 -0800 |
|---|---|---|
| committer | Eric Blossom <eb@comsec.com> | 2010-11-24 17:29:11 -0800 |
| commit | d692a41f98e7b888c745efbb9fcbbb0400f39025 (patch) | |
| tree | 591782e695d1d29f2dfcfe6390fc21cd99a06a16 /gr-usrp | |
| parent | 42fe3e571be14e70cb06ea1244125553f0606be4 (diff) | |
Major Makefile.am housecleaning. Passes distcheck.
Move all occurrences of swig_built_sources out of Makefile.am's.
Move all SWIG related use of BUILT_SOURCES out of Makefile.am's.
Clean up 'if PYTHON' conditionalization in gr-*
Still left to do: fix Makefile.swig CLEANFILES and no_dist_files
such that they remove exactly the generated files.
Diffstat (limited to 'gr-usrp')
| -rw-r--r-- | gr-usrp/Makefile.am | 2 | ||||
| -rw-r--r-- | gr-usrp/src/Makefile.am | 19 |
2 files changed, 6 insertions, 15 deletions
diff --git a/gr-usrp/Makefile.am b/gr-usrp/Makefile.am index 136ce15799..221a108169 100644 --- a/gr-usrp/Makefile.am +++ b/gr-usrp/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ README_MULTI_USRP.txt \ gnuradio-usrp.pc.in diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am index 9c1f4b525c..7a16fe5b16 100644 --- a/gr-usrp/src/Makefile.am +++ b/gr-usrp/src/Makefile.am @@ -22,18 +22,16 @@ 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 +if GUILE nobase_guile_DATA = gnuradio/usrp.scm - -TESTS = +endif # ---------------------------------------------------------------- # The straight C++ library @@ -109,13 +107,6 @@ usrp_swig_swiginclude_headers = \ usrp_standard.i -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) - - if PYTHON TESTS += run_tests endif |