diff options
| -rw-r--r-- | gr-howto-write-a-block/Makefile.common | 4 | ||||
| -rw-r--r-- | gr-howto-write-a-block/Makefile.swig.gen.t | 2 | ||||
| -rwxr-xr-x | gr-howto-write-a-block/python/qa_howto.py | 6 | ||||
| -rw-r--r-- | gr-howto-write-a-block/swig/Makefile.am | 3 | ||||
| -rw-r--r-- | gr-howto-write-a-block/swig/Makefile.swig.gen | 2 |
5 files changed, 10 insertions, 7 deletions
diff --git a/gr-howto-write-a-block/Makefile.common b/gr-howto-write-a-block/Makefile.common index ecf3f6d59..fca6133c1 100644 --- a/gr-howto-write-a-block/Makefile.common +++ b/gr-howto-write-a-block/Makefile.common @@ -71,8 +71,8 @@ guiledir = $(prefix)/share/guile/site # This usually ends up at: # ${prefix}/lib/python${python_version}/site-packages/$(modname) -modpythondir = $(pythondir)/gnuradio/$(modname) -modpyexecdir = $(pyexecdir)/gnuradio/$(modname) +modpythondir = $(pythondir)/$(modname) +modpyexecdir = $(pyexecdir)/$(modname) # Data directory for grc block wrappers grc_blocksdir = $(prefix)/share/gnuradio/grc/blocks diff --git a/gr-howto-write-a-block/Makefile.swig.gen.t b/gr-howto-write-a-block/Makefile.swig.gen.t index 4d37e0e21..3c76ee4b4 100644 --- a/gr-howto-write-a-block/Makefile.swig.gen.t +++ b/gr-howto-write-a-block/Makefile.swig.gen.t @@ -33,7 +33,7 @@ ## this has to be done in the including Makefile.am -before- ## Makefile.swig is included. -@NAME@_pythondir_category ?= gnuradio/@NAME@ +@NAME@_pythondir_category ?= @NAME@ @NAME@_pylibdir_category ?= $(@NAME@_pythondir_category) @NAME@_pythondir = $(pythondir)/$(@NAME@_pythondir_category) @NAME@_pylibdir = $(pyexecdir)/$(@NAME@_pylibdir_category) diff --git a/gr-howto-write-a-block/python/qa_howto.py b/gr-howto-write-a-block/python/qa_howto.py index 96bec2c08..630f57bf4 100755 --- a/gr-howto-write-a-block/python/qa_howto.py +++ b/gr-howto-write-a-block/python/qa_howto.py @@ -21,7 +21,7 @@ # from gnuradio import gr, gr_unittest -from gnuradio import howto +import howto_swig class qa_howto (gr_unittest.TestCase): @@ -35,7 +35,7 @@ class qa_howto (gr_unittest.TestCase): src_data = (-3, 4, -5.5, 2, 3) expected_result = (9, 16, 30.25, 4, 9) src = gr.vector_source_f (src_data) - sqr = howto.square_ff () + sqr = howto_swig.square_ff () dst = gr.vector_sink_f () self.tb.connect (src, sqr) self.tb.connect (sqr, dst) @@ -47,7 +47,7 @@ class qa_howto (gr_unittest.TestCase): src_data = (-3, 4, -5.5, 2, 3) expected_result = (9, 16, 30.25, 4, 9) src = gr.vector_source_f (src_data) - sqr = howto.square2_ff () + sqr = howto_swig.square2_ff () dst = gr.vector_sink_f () self.tb.connect (src, sqr) self.tb.connect (sqr, dst) diff --git a/gr-howto-write-a-block/swig/Makefile.am b/gr-howto-write-a-block/swig/Makefile.am index 7ec3a7cbc..66d08eaf3 100644 --- a/gr-howto-write-a-block/swig/Makefile.am +++ b/gr-howto-write-a-block/swig/Makefile.am @@ -36,6 +36,9 @@ TOP_SWIG_IFILES = \ # import howto # This ends up at: # ${prefix}/lib/python${python_version}/site-packages/$(modname) +howto_swig_pythondir_category = $(modname) + +# additional libraries for linking with the SWIG-generated library howto_swig_la_swig_libadd = \ $(top_builddir)/lib/libgnuradio-howto.la diff --git a/gr-howto-write-a-block/swig/Makefile.swig.gen b/gr-howto-write-a-block/swig/Makefile.swig.gen index 1e63fcb0d..6b7be2185 100644 --- a/gr-howto-write-a-block/swig/Makefile.swig.gen +++ b/gr-howto-write-a-block/swig/Makefile.swig.gen @@ -33,7 +33,7 @@ ## this has to be done in the including Makefile.am -before- ## Makefile.swig is included. -howto_swig_pythondir_category ?= gnuradio/howto +howto_swig_pythondir_category ?= howto_swig howto_swig_pylibdir_category ?= $(howto_swig_pythondir_category) howto_swig_pythondir = $(pythondir)/$(howto_swig_pythondir_category) howto_swig_pylibdir = $(pyexecdir)/$(howto_swig_pylibdir_category) |