diff options
| author | Johnathan Corgan | 2010-06-02 16:42:26 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-06-02 16:42:26 -0700 |
| commit | ba0a21798e0d59ac54454908e4dabeac5783f731 (patch) | |
| tree | e8050e420483d7730c9273c91cbbd4a09c250030 /gnuradio-core/src | |
| parent | 483681462b8138f048746502b72982d8bc5730b0 (diff) | |
| parent | b3bd2c61d615ba01f1fb97819461b057190e1632 (diff) | |
| download | gnuradio-ba0a21798e0d59ac54454908e4dabeac5783f731.tar.gz gnuradio-ba0a21798e0d59ac54454908e4dabeac5783f731.tar.bz2 gnuradio-ba0a21798e0d59ac54454908e4dabeac5783f731.zip | |
Merge branch 'master' into next
* master:
gcell: make versioned libraries
gnuradio-core: fix missing linker flags for boost_program_options
howto: fix incorrect include path
build: redo GR_GIT for portability
build: use date format string instead of -R for portability
gnuradio-core: fix typo in doxygen header
gr-qtgui: add include file for gcc 4.4.1
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/Makefile.am | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/io/gr_udp_source.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am index 86e3aa1f6..f3a3accdb 100644 --- a/gnuradio-core/src/lib/Makefile.am +++ b/gnuradio-core/src/lib/Makefile.am @@ -69,4 +69,4 @@ libgnuradio_core_qa_la_LIBADD = \ bin_PROGRAMS = gnuradio-config-info gnuradio_config_info_SOURCES = gnuradio-config-info.cc -gnuradio_config_info_LDADD = libgnuradio-core.la $(BOOST_PROGRAM_OPTIONS_LIB) +gnuradio_config_info_LDADD = libgnuradio-core.la $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB) diff --git a/gnuradio-core/src/lib/io/gr_udp_source.h b/gnuradio-core/src/lib/io/gr_udp_source.h index e23231aa7..5d30fad30 100644 --- a/gnuradio-core/src/lib/io/gr_udp_source.h +++ b/gnuradio-core/src/lib/io/gr_udp_source.h @@ -95,7 +95,7 @@ class gr_udp_source : public gr_sync_block /*! \brief return the PAYLOAD_SIZE of the socket */ int payload_size() { return d_payload_size; } - /*! \breif return the port number of the socket */ + /*! \brief return the port number of the socket */ int get_port(); // should we export anything else? |