diff options
Diffstat (limited to 'gr-howto-write-a-block/swig')
| -rw-r--r-- | gr-howto-write-a-block/swig/Makefile.am | 11 | ||||
| -rw-r--r-- | gr-howto-write-a-block/swig/Makefile.swig.gen | 10 |
2 files changed, 9 insertions, 12 deletions
diff --git a/gr-howto-write-a-block/swig/Makefile.am b/gr-howto-write-a-block/swig/Makefile.am index fc40109d0..140d54f80 100644 --- a/gr-howto-write-a-block/swig/Makefile.am +++ b/gr-howto-write-a-block/swig/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005,2006,2008,2009 Free Software Foundation, Inc. +# Copyright 2004,2005,2006,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -27,14 +27,13 @@ if PYTHON ################################### # SWIG Python interface and library -TOP_SWIG_IFILES = \ +TOP_SWIG_IFILES = \ howto.i # Install so that they end up available as: -# import gnuradio.howto +# import howto # This ends up at: -# ${prefix}/lib/python${python_version}/site-packages/gnuradio -howto_pythondir_category = gnuradio/howto +# ${prefix}/lib/python${python_version}/site-packages/$(modname) howto_la_swig_libadd = \ $(top_builddir)/lib/libgnuradio-howto.la @@ -48,7 +47,7 @@ BUILT_SOURCES = $(swig_built_sources) no_dist_files = $(swig_built_sources) # additional SWIG files to be installed -howto_swiginclude_headers = \ +swiginclude_headers = \ howto_square_ff.i \ howto_square2_ff.i diff --git a/gr-howto-write-a-block/swig/Makefile.swig.gen b/gr-howto-write-a-block/swig/Makefile.swig.gen index c62e5aa3e..1809032d3 100644 --- a/gr-howto-write-a-block/swig/Makefile.swig.gen +++ b/gr-howto-write-a-block/swig/Makefile.swig.gen @@ -33,10 +33,8 @@ ## this has to be done in the including Makefile.am -before- ## Makefile.swig is included. -howto_pythondir_category ?= gnuradio/howto -howto_pylibdir_category ?= $(howto_pythondir_category) -howto_pythondir = $(pythondir)/$(howto_pythondir_category) -howto_pylibdir = $(pyexecdir)/$(howto_pylibdir_category) +howto_pythondir = $(pythondir)/howto +howto_pylibdir = $(pyexecdir)/howto ## SWIG headers are always installed into the same directory. @@ -79,7 +77,7 @@ swig_built_sources += howto_swig.py howto_swig.cc ## Makefile.swig . howto_swiginclude_HEADERS = \ - howto.i \ + howto.i \ $(howto_swiginclude_headers) howto_pylib_LTLIBRARIES = \ @@ -89,7 +87,7 @@ _howto_swig_la_SOURCES = \ howto_swig.cc \ $(howto_la_swig_sources) -_howto_swig_la_LIBADD = \ +_howto_swig_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(howto_la_swig_libadd) |