diff options
Diffstat (limited to 'gr-pager')
| -rw-r--r-- | gr-pager/gnuradio-pager.pc.in | 2 | ||||
| -rw-r--r-- | gr-pager/lib/Makefile.am | 3 | ||||
| -rw-r--r-- | gr-pager/lib/pager_flex_deinterleave.cc | 4 | ||||
| -rw-r--r-- | gr-pager/lib/pager_flex_parse.cc | 4 | ||||
| -rw-r--r-- | gr-pager/lib/pager_flex_sync.cc | 4 | ||||
| -rw-r--r-- | gr-pager/lib/pager_slicer_fb.cc | 4 | ||||
| -rwxr-xr-x | gr-pager/python/qa_pager.py | 6 |
7 files changed, 13 insertions, 14 deletions
diff --git a/gr-pager/gnuradio-pager.pc.in b/gr-pager/gnuradio-pager.pc.in index 35516b6ed..6fda2d2f2 100644 --- a/gr-pager/gnuradio-pager.pc.in +++ b/gr-pager/gnuradio-pager.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gnuradio-comedi Description: GNU Radio blocks implementing a FLEX pager decoder Requires: gnuradio-core -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-pager Cflags: -I${includedir} diff --git a/gr-pager/lib/Makefile.am b/gr-pager/lib/Makefile.am index 1d8a43b3c..29c82ebe8 100644 --- a/gr-pager/lib/Makefile.am +++ b/gr-pager/lib/Makefile.am @@ -49,5 +49,4 @@ libgnuradio_pager_la_SOURCES = \ libgnuradio_pager_la_LIBADD = \ $(GNURADIO_CORE_LA) -libgnuradio_pager_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_pager_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) diff --git a/gr-pager/lib/pager_flex_deinterleave.cc b/gr-pager/lib/pager_flex_deinterleave.cc index 25ea22e39..a51670b22 100644 --- a/gr-pager/lib/pager_flex_deinterleave.cc +++ b/gr-pager/lib/pager_flex_deinterleave.cc @@ -1,5 +1,5 @@ /* - * Copyright 2004,2006 Free Software Foundation, Inc. + * Copyright 2004,2006,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -30,7 +30,7 @@ pager_flex_deinterleave_sptr pager_make_flex_deinterleave() { - return pager_flex_deinterleave_sptr(new pager_flex_deinterleave()); + return gnuradio::get_initial_sptr(new pager_flex_deinterleave()); } pager_flex_deinterleave::pager_flex_deinterleave() : diff --git a/gr-pager/lib/pager_flex_parse.cc b/gr-pager/lib/pager_flex_parse.cc index 0819294da..19d3d96c6 100644 --- a/gr-pager/lib/pager_flex_parse.cc +++ b/gr-pager/lib/pager_flex_parse.cc @@ -1,5 +1,5 @@ /* - * Copyright 2004,2006,2007 Free Software Foundation, Inc. + * Copyright 2004,2006,2007,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -32,7 +32,7 @@ pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq) { - return pager_flex_parse_sptr(new pager_flex_parse(queue, freq)); + return gnuradio::get_initial_sptr(new pager_flex_parse(queue, freq)); } pager_flex_parse::pager_flex_parse(gr_msg_queue_sptr queue, float freq) : diff --git a/gr-pager/lib/pager_flex_sync.cc b/gr-pager/lib/pager_flex_sync.cc index 6bcee8ede..61cf4ad38 100644 --- a/gr-pager/lib/pager_flex_sync.cc +++ b/gr-pager/lib/pager_flex_sync.cc @@ -1,5 +1,5 @@ /* - * Copyright 2004,2006 Free Software Foundation, Inc. + * Copyright 2004,2006,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -33,7 +33,7 @@ pager_flex_sync_sptr pager_make_flex_sync() { - return pager_flex_sync_sptr(new pager_flex_sync()); + return gnuradio::get_initial_sptr(new pager_flex_sync()); } // FLEX sync block takes input from sliced baseband stream [0-3] at specified diff --git a/gr-pager/lib/pager_slicer_fb.cc b/gr-pager/lib/pager_slicer_fb.cc index d419db78a..53ba7b9de 100644 --- a/gr-pager/lib/pager_slicer_fb.cc +++ b/gr-pager/lib/pager_slicer_fb.cc @@ -1,5 +1,5 @@ /* - * Copyright 2004,2006,2007 Free Software Foundation, Inc. + * Copyright 2004,2006,2007,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -28,7 +28,7 @@ pager_slicer_fb_sptr pager_make_slicer_fb(float alpha) { - return pager_slicer_fb_sptr(new pager_slicer_fb(alpha)); + return gnuradio::get_initial_sptr(new pager_slicer_fb(alpha)); } pager_slicer_fb::pager_slicer_fb(float alpha) : diff --git a/gr-pager/python/qa_pager.py b/gr-pager/python/qa_pager.py index 5bf72b561..12a45d4c3 100755 --- a/gr-pager/python/qa_pager.py +++ b/gr-pager/python/qa_pager.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,7 +23,7 @@ from gnuradio import gr, gr_unittest import pager_swig -class qa_pgr(gr_unittest.TestCase): +class test_pager(gr_unittest.TestCase): def setUp (self): self.tb = gr.top_block () @@ -32,4 +32,4 @@ class qa_pgr(gr_unittest.TestCase): self.tb = None if __name__ == '__main__': - gr_unittest.main () + gr_unittest.run(test_pager, "test_pager.xml") |