diff options
Diffstat (limited to 'gr-comedi')
| -rw-r--r-- | gr-comedi/gnuradio-comedi.pc.in | 2 | ||||
| -rw-r--r-- | gr-comedi/src/Makefile.am | 3 | ||||
| -rw-r--r-- | gr-comedi/src/comedi_sink_s.cc | 4 | ||||
| -rw-r--r-- | gr-comedi/src/comedi_source_s.cc | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/gr-comedi/gnuradio-comedi.pc.in b/gr-comedi/gnuradio-comedi.pc.in index 8c320b563..205b40e37 100644 --- a/gr-comedi/gnuradio-comedi.pc.in +++ b/gr-comedi/gnuradio-comedi.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: gnuradio-comedi Description: GNU Radio blocks for the comedi library Requires: gnuradio-core -Version: @VERSION@ +Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-comedi Cflags: -I${includedir} diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am index 462c50ad5..a55bd175b 100644 --- a/gr-comedi/src/Makefile.am +++ b/gr-comedi/src/Makefile.am @@ -47,8 +47,7 @@ libgnuradio_comedi_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(COMEDI_LIBS) -libgnuradio_comedi_la_LDFLAGS = \ - $(NO_UNDEFINED) +libgnuradio_comedi_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) if PYTHON ################################### diff --git a/gr-comedi/src/comedi_sink_s.cc b/gr-comedi/src/comedi_sink_s.cc index 7f4c6d6aa..d4a668758 100644 --- a/gr-comedi/src/comedi_sink_s.cc +++ b/gr-comedi/src/comedi_sink_s.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2005 Free Software Foundation, Inc. + * Copyright 2005,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -52,7 +52,7 @@ default_device_name () comedi_sink_s_sptr comedi_make_sink_s (int sampling_freq, const std::string dev) { - return comedi_sink_s_sptr (new comedi_sink_s (sampling_freq, dev)); + return gnuradio::get_initial_sptr(new comedi_sink_s (sampling_freq, dev)); } comedi_sink_s::comedi_sink_s (int sampling_freq, diff --git a/gr-comedi/src/comedi_source_s.cc b/gr-comedi/src/comedi_source_s.cc index 4e3980e76..a52d04e2a 100644 --- a/gr-comedi/src/comedi_source_s.cc +++ b/gr-comedi/src/comedi_source_s.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2005 Free Software Foundation, Inc. + * Copyright 2005,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -49,7 +49,7 @@ default_device_name () comedi_source_s_sptr comedi_make_source_s (int sampling_freq, const std::string dev) { - return comedi_source_s_sptr (new comedi_source_s (sampling_freq, dev)); + return gnuradio::get_initial_sptr(new comedi_source_s (sampling_freq, dev)); } comedi_source_s::comedi_source_s (int sampling_freq, |