diff options
| author | Johnathan Corgan | 2009-11-13 11:27:55 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2009-11-13 11:27:55 -0800 |
| commit | df8b099a4b96ad41369a750d48a8576b95ecf454 (patch) | |
| tree | 508a46bc300386bda1a934166d9ce2b582d799aa | |
| parent | 86e93e757a16c139f58b8b524c99f994c7bc60c4 (diff) | |
| download | gnuradio-df8b099a4b96ad41369a750d48a8576b95ecf454.tar.gz gnuradio-df8b099a4b96ad41369a750d48a8576b95ecf454.tar.bz2 gnuradio-df8b099a4b96ad41369a750d48a8576b95ecf454.zip | |
howto: cleanup for merge
| -rw-r--r-- | gr-howto-write-a-block/README.hacking | 16 | ||||
| -rw-r--r-- | gr-howto-write-a-block/python/__init__.py | 2 | ||||
| -rw-r--r-- | gr-howto-write-a-block/swig/Makefile.am | 3 |
3 files changed, 10 insertions, 11 deletions
diff --git a/gr-howto-write-a-block/README.hacking b/gr-howto-write-a-block/README.hacking index a9e68dd89..c670fd19e 100644 --- a/gr-howto-write-a-block/README.hacking +++ b/gr-howto-write-a-block/README.hacking @@ -69,16 +69,16 @@ that exports the C++ API into a Python namespace. Each GNU Radio block gets a .i file (using SWIG syntax). The master howto.i file must also have a line to include the block header file and a line to import the block .i file. The resulting _howto_swig.so and _howto_swig.py files are installed into the -system Python lib directory under howto/ and become part of the gnuradio.howto -Python namespace. The Makefile.am must be customized to recognize new files -created here. +system Python lib directory under gnuradio/howto and become part of the +gnuradio.howto Python namespace. The Makefile.am must be customized to +recognize new files created here. The 'python' directory contains pure Python modules that get installed into -the system Python lib directory under howto/ and the __init__.py module -needed to turn the directory into the gnuradio.howto namespace. This is the -appropriate place to put hierarchical blocks and utility classes. Be sure -to edit the __init__.py to add your module/symbol imports as necessary, and -to modify the Makefile.am accordingly. +the system Python lib directory under gnuradio/howto and the __init__.py +module needed to turn the directory into the gnuradio.howto namespace. +This is the appropriate place to put hierarchical blocks and utility classes. +Be sure to edit the __init__.py to add your module/symbol imports as +necessary, and to modify the Makefile.am accordingly. This directory also contains Python-based QA code, which is executed during 'make check'. diff --git a/gr-howto-write-a-block/python/__init__.py b/gr-howto-write-a-block/python/__init__.py index 3107e1fb9..d4a41c271 100644 --- a/gr-howto-write-a-block/python/__init__.py +++ b/gr-howto-write-a-block/python/__init__.py @@ -36,7 +36,7 @@ if _RTLD_GLOBAL != 0: # ---------------------------------------------------------------- -# import swig generated symbols into the trppm namespace +# import swig generated symbols into the howto namespace from howto_swig import * # import any pure python here diff --git a/gr-howto-write-a-block/swig/Makefile.am b/gr-howto-write-a-block/swig/Makefile.am index 8c94f5041..fc40109d0 100644 --- a/gr-howto-write-a-block/swig/Makefile.am +++ b/gr-howto-write-a-block/swig/Makefile.am @@ -34,8 +34,7 @@ TOP_SWIG_IFILES = \ # import gnuradio.howto # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio -howto_pythondir_category = \ - gnuradio +howto_pythondir_category = gnuradio/howto howto_la_swig_libadd = \ $(top_builddir)/lib/libgnuradio-howto.la |