diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-10-31 17:12:06 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-10-31 17:12:06 -0400 |
| commit | 59f9e558daeb3d148a26fbb56fedc8f1dac1a5bb (patch) | |
| tree | 8c399ba425fdf1845e677882d073fbc14d2a8b9d /gnuradio-core/src/python | |
| parent | 1cd15f64cb2b53219133bcb3821f76ecd2582ff5 (diff) | |
| parent | ac9430cd39bf12395952ca49b1966ec428fdadf3 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/CMakeLists.txt
gr-digital/include/digital_additive_scrambler_bb.h
gr-digital/include/digital_descrambler_bb.h
gr-digital/include/digital_scrambler_bb.h
gr-digital/lib/CMakeLists.txt
Conflicts were for adding dependency on gr-analog.
additive_scrambler_bb_impl, descrambler_bb_impl, and scrambler_bb_impl were update to use LFSR from gr-analog.
Diffstat (limited to 'gnuradio-core/src/python')
| -rw-r--r-- | gnuradio-core/src/python/build_utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-core/src/python/build_utils.py b/gnuradio-core/src/python/build_utils.py index cbf991aa56..cf58a97637 100644 --- a/gnuradio-core/src/python/build_utils.py +++ b/gnuradio-core/src/python/build_utils.py @@ -212,7 +212,7 @@ def standard_impl_dict2 (name, code3, package): d = {} d['NAME'] = name d['IMPL_NAME'] = name - d['BASE_NAME'] = name.rstrip("_impl") + d['BASE_NAME'] = name.rstrip("impl").rstrip("_") d['GUARD_NAME'] = 'INCLUDED_%s_%s_H' % (package.upper(), name.upper()) d['WARNING'] = 'WARNING: this file is machine generated. Edits will be overwritten' d['COPYRIGHT'] = copyright |