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-usrp2/src | |
| 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-usrp2/src')
| -rw-r--r-- | gr-usrp2/src/Makefile.am | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am index 8b94ae54f6..8e1d0c20c3 100644 --- a/gr-usrp2/src/Makefile.am +++ b/gr-usrp2/src/Makefile.am @@ -20,8 +20,12 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig TESTS = +EXTRA_DIST += run_tests.in +DISTCLEANFILES += run_tests + # ---------------------------------------------------------------------- # Local Python files, not installed @@ -35,9 +39,6 @@ noinst_PYTHON = qa_usrp2.py # Miscellaneous build operations # ---------------------------------------------------------------------- -EXTRA_DIST = run_tests.in -DISTCLEANFILES = run_tests - # ---------------------------------------------------------------------- # C++ block API interface librar(ies) # @@ -82,14 +83,12 @@ noinst_HEADERS = \ rx_16sc_handler.h \ rx_32fc_handler.h -if PYTHON # ---------------------------------------------------------------------- -# Python SWIG wrapper around C++ library +# SWIG wrappers around C++ library # # usrp2.py # _usrp2.so # ---------------------------------------------------------------------- -TESTS += run_tests TOP_SWIG_IFILES = \ usrp2.i @@ -109,11 +108,6 @@ usrp2_swig_args = \ usrp2_la_swig_libadd = \ libgnuradio-usrp2.la -include $(top_srcdir)/Makefile.swig - -# 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) -endif +if PYTHON +TESTS += run_tests +endif
\ No newline at end of file |