diff options
author | Eric Blossom | 2010-03-04 07:06:30 -0800 |
---|---|---|
committer | Eric Blossom | 2010-03-04 07:06:30 -0800 |
commit | 72edafee64f906f4e5db07ac66032492c6a7a617 (patch) | |
tree | b830fea08812bb9d3623b0cf92673327cc80788e /gr-howto-write-a-block/swig/Makefile.swig.gen | |
parent | eb6ff48d9b5894d1662f361d82d2c7cd80b35218 (diff) | |
parent | 6c3b6396bc420228215072b2fc1b83c82eaeb291 (diff) | |
download | gnuradio-72edafee64f906f4e5db07ac66032492c6a7a617.tar.gz gnuradio-72edafee64f906f4e5db07ac66032492c6a7a617.tar.bz2 gnuradio-72edafee64f906f4e5db07ac66032492c6a7a617.zip |
Merge branch 'howto'
* howto:
Refactor gr-howto-write-a-block such that it no longer installs into
Diffstat (limited to 'gr-howto-write-a-block/swig/Makefile.swig.gen')
-rw-r--r-- | gr-howto-write-a-block/swig/Makefile.swig.gen | 10 |
1 files changed, 4 insertions, 6 deletions
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) |