diff options
author | Eric Blossom | 2010-03-04 07:02:42 -0800 |
---|---|---|
committer | Eric Blossom | 2010-03-04 07:02:42 -0800 |
commit | 6c3b6396bc420228215072b2fc1b83c82eaeb291 (patch) | |
tree | 1236889fec1ca3b5f65e8b5992a8f67f490a5eb4 /gr-howto-write-a-block/lib | |
parent | b811e8749dcd7c96f1af2d98caba403e50c1602b (diff) | |
download | gnuradio-6c3b6396bc420228215072b2fc1b83c82eaeb291.tar.gz gnuradio-6c3b6396bc420228215072b2fc1b83c82eaeb291.tar.bz2 gnuradio-6c3b6396bc420228215072b2fc1b83c82eaeb291.zip |
Refactor gr-howto-write-a-block such that it no longer installs into
the gnuradio python namespace, but rather in the howto namespace.
This allows it to be installed under a separate --prefix in the common
case where the user doing the "out of tree build" is going to be
installing their new and/or modified code somewhere other than the
system installation directories.
Any code that uses these blocks should now import them using:
import howto
instead of
from gnuradio import howto
Diffstat (limited to 'gr-howto-write-a-block/lib')
-rw-r--r-- | gr-howto-write-a-block/lib/Makefile.am | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/gr-howto-write-a-block/lib/Makefile.am b/gr-howto-write-a-block/lib/Makefile.am index 336cb8a20..2e76ee453 100644 --- a/gr-howto-write-a-block/lib/Makefile.am +++ b/gr-howto-write-a-block/lib/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 # @@ -28,21 +28,21 @@ TESTS = test_all # howto C++ library: libgnuradio-howto.so # ---------------------------------------------------------------- -# C/C++ headers get installed in ${prefix}/include/gnuradio -grinclude_HEADERS = \ - howto_square_ff.h \ +# C/C++ headers get installed in ${prefix}/include/$(modname) +modinclude_HEADERS = \ + howto_square_ff.h \ howto_square2_ff.h lib_LTLIBRARIES = libgnuradio-howto.la -libgnuradio_howto_la_SOURCES = \ - howto_square_ff.cc \ +libgnuradio_howto_la_SOURCES = \ + howto_square_ff.cc \ howto_square2_ff.cc -libgnuradio_howto_la_LIBADD = \ +libgnuradio_howto_la_LIBADD = \ $(GNURADIO_CORE_LA) -libgnuradio_howto_la_LDFLAGS = \ +libgnuradio_howto_la_LDFLAGS = \ $(NO_UNDEFINED) # ---------------------------------------------------------------- @@ -51,23 +51,23 @@ libgnuradio_howto_la_LDFLAGS = \ noinst_LTLIBRARIES = libgnuradio-howto-qa.la -libgnuradio_howto_qa_la_SOURCES = \ - qa_howto.cc \ - qa_howto_square_ff.cc \ +libgnuradio_howto_qa_la_SOURCES = \ + qa_howto.cc \ + qa_howto_square_ff.cc \ qa_howto_square2_ff.cc libgnuradio_howto_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 -libgnuradio_howto_qa_la_LIBADD = \ - libgnuradio-howto.la \ +libgnuradio_howto_qa_la_LIBADD = \ + libgnuradio-howto.la \ $(CPPUNIT_LIBS) # ---------------------------------------------------------------- # headers that don't get installed # ---------------------------------------------------------------- -noinst_HEADERS = \ - qa_howto.h \ - qa_howto_square_ff.h \ +noinst_HEADERS = \ + qa_howto.h \ + qa_howto_square_ff.h \ qa_howto_square2_ff.h # ---------------------------------------------------------------- |