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-uhd | |
| 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-uhd')
| -rw-r--r-- | gr-uhd/grc/Makefile.am | 4 | ||||
| -rw-r--r-- | gr-uhd/swig/Makefile.am | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/gr-uhd/grc/Makefile.am b/gr-uhd/grc/Makefile.am index d424ca7096..6a336c893b 100644 --- a/gr-uhd/grc/Makefile.am +++ b/gr-uhd/grc/Makefile.am @@ -31,7 +31,7 @@ generated_uhd_single_usrp_blocks = \ uhd_single_usrp_source.xml \ uhd_single_usrp_sink.xml -BUILT_SOURCES = \ +BUILT_SOURCES += \ $(generated_uhd_multi_usrp_blocks) \ $(generated_uhd_single_usrp_blocks) @@ -49,7 +49,7 @@ dist_grcblocks_DATA += \ ######################################################################## # Rules for generating the source and sink xml wrappers ######################################################################## -EXTRA_DIST = \ +EXTRA_DIST += \ $(srcdir)/gen_uhd_multi_usrp_blocks_xml.py \ $(srcdir)/gen_uhd_single_usrp_blocks_xml.py diff --git a/gr-uhd/swig/Makefile.am b/gr-uhd/swig/Makefile.am index abf38b2930..11c0cabb2f 100644 --- a/gr-uhd/swig/Makefile.am +++ b/gr-uhd/swig/Makefile.am @@ -22,6 +22,8 @@ include $(top_srcdir)/Makefile.common include $(top_srcdir)/Makefile.swig +EXTRA_DIST += $(nobase_guile_DATA) + AM_CPPFLAGS = \ $(STD_DEFINES_AND_INCLUDES) \ $(PYTHON_CPPFLAGS) \ @@ -59,13 +61,6 @@ uhd_swig_python = \ # additional SWIG files to be installed uhd_swig_swiginclude_headers = - uhd_swig_swig_args = \ $(UHD_CFLAGS) \ -I$(top_srcdir)/gr-uhd/lib - -# 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) |