Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into next | Tom Rondeau | 2013-03-13 | 1 | -3/+3 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-audio/lib/CMakeLists.txt gr-blocks/include/blocks/CMakeLists.txt gr-blocks/include/blocks/socket_pdu.h gr-blocks/lib/CMakeLists.txt gr-blocks/swig/blocks_swig.i gr-comedi/src/CMakeLists.txt gr-howto-write-a-block/lib/CMakeLists.txt gr-noaa/lib/CMakeLists.txt gr-qtgui/lib/CMakeLists.txt gr-uhd/lib/CMakeLists.txt gr-vocoder/lib/CMakeLists.txt gr-wavelet/lib/CMakeLists.txt | ||||
| * | log: replacing log4cxx with log4cpp. | Tom Rondeau | 2013-03-13 | 1 | -3/+3 |
| | | |||||
* | | blocks: removing file_sink/source file_descriptor_sink/source form core and ↵ | Tom Rondeau | 2013-03-10 | 5 | -11/+11 |
| | | | | | | | | moved all refs to gr-blocks. | ||||
* | | blocks: removing blocks moved into gr-blocks: | Tom Rondeau | 2013-03-06 | 4 | -17/+17 |
| | | | | | | | | message_strobe, message_debug, message_source, message_sink, message_burst_source, peak_detector, moving_average. | ||||
* | | Merge branch 'master' into next | Tom Rondeau | 2013-03-05 | 2 | -1/+70 |
|\| | | | | | | | | | | | | | | | Conflicts: gr-atsc/src/lib/CMakeLists.txt gr-noaa/lib/CMakeLists.txt gr-trellis/src/lib/CMakeLists.txt gr-video-sdl/src/CMakeLists.txt | ||||
| * | Added Windows DLL resource files | Nicholas Corgan | 2013-03-05 | 2 | -1/+70 |
| | | |||||
* | | Merge branch 'master' into next | Tom Rondeau | 2013-03-03 | 1 | -0/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnuradio-core/CMakeLists.txt gnuradio-core/gnuradio-core.conf gnuradio-core/src/lib/filter/gr_fir_sysconfig_x86.cc gnuradio-core/src/lib/runtime/runtime.i gr-atsc/src/lib/CMakeLists.txt gr-audio/lib/CMakeLists.txt gr-comedi/src/CMakeLists.txt gr-digital/lib/CMakeLists.txt gr-howto-write-a-block/CMakeLists.txt gr-howto-write-a-block/lib/CMakeLists.txt gr-noaa/lib/CMakeLists.txt gr-qtgui/lib/CMakeLists.txt gr-trellis/src/lib/CMakeLists.txt gr-uhd/lib/CMakeLists.txt gr-video-sdl/src/CMakeLists.txt gr-vocoder/lib/CMakeLists.txt gr-wavelet/lib/CMakeLists.txt | ||||
| * | Merge branch 'master' into gr_log | Tom Rondeau | 2013-03-01 | 2 | -4/+5 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/Modules/GrMiscUtils.cmake docs/doxygen/other/main_page.dox gnuradio-core/gnuradio-core.conf.in gnuradio-core/src/lib/swig/CMakeLists.txt gr-digital/lib/CMakeLists.txt gr-howto-write-a-block/CMakeLists.txt gr-qtgui/lib/CMakeLists.txt gr-video-sdl/src/CMakeLists.txt | ||||
| * \ | Merge branch 'master' into gr_log | Tom Rondeau | 2012-09-06 | 1 | -0/+2 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt cmake/Modules/GrMiscUtils.cmake docs/doxygen/other/build_guide.dox gnuradio-core/CMakeLists.txt gr-digital/lib/CMakeLists.txt | ||||
| * | | | Fixing up the gr-log capabilities. | Tom Rondeau | 2012-06-08 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | Better handling of enable/disable function, easier integration with all components if log4cxx is or is not there. All components have been updated to be able to use logging. Docs update, too. | ||||
* | | | | ctrlport: allowing all components to use ControlPort. | Tom Rondeau | 2013-03-01 | 1 | -0/+5 |
| | | | | |||||
* | | | | blocks: removing throttle, threshold, stretch from gnuradio-core. | Tom Rondeau | 2013-02-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | noaa: converting to new API structure. | Tom Rondeau | 2013-01-13 | 26 | -710/+857 |
| | | | | |||||
* | | | | Merge master/fix_build_dir_order into next, then fix conflicts and redo come ↵ | Michael L Dickens | 2013-01-04 | 2 | -2/+5 |
|\ \ \ \ | | |_|/ | |/| | | | | | | of the INCLUDE_DIRS order | ||||
| * | | | Tweak INCLUDE dirs such that INCLUDE_DIRECTORIES and LINK_DIRECTORIES are ↵ | Michael L Dickens | 2013-01-01 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | ordered as: internal build and source for this component, other components (internal build and source, or already installed), non-project non-system dependencies (e.g., Qt, Boost, Python), system dependencies (e.g., CoreAudio). | ||||
* | | | | grc: updating GRC exmaples for new component changes. | Tom Rondeau | 2012-12-27 | 2 | -5/+5 |
| | | | | |||||
* | | | | blocks: removes blocks moved to gr-blocks from gnuradio-core. | Tom Rondeau | 2012-12-21 | 1 | -0/+1 |
|/ / / | | | | | | | | | | Also fixes up some other missing moves. | ||||
* | / | build: removing core_swig from GR_SWIG_TARGET_DEPS. Seems to have been the ↵ | Tom Rondeau | 2012-12-12 | 1 | -2/+0 |
| |/ |/| | | | | | cause of the parallel build woes. | ||||
* | | swig: added GR_SWIG_TARGET_DEPS core_swig to other swig builds | Johnathan Corgan | 2012-07-03 | 1 | -0/+2 |
|/ | | | | | | | | | I have not encountered an issue, however this is the correct thing to do. Now individual components swig builds depend on the gr core swig target. Conflicts: gr-filter/swig/CMakeLists.txt | ||||
* | Removed whitespace and added dtools/bin/remove-whitespace as a tool to do ↵ | Tom Rondeau | 2012-04-13 | 15 | -72/+72 |
| | | | | | | this in the future. The sed script was provided by Moritz Fischer. | ||||
* | Merge branch 'rm_python_ext' into cmake_builds | Tom Rondeau | 2012-04-03 | 12 | -1239/+11 |
|\ | | | | | | | | | Conflicts: CMakeLists.txt | ||||
| * | examples: Reworked locations and installation of examples. | Tom Rondeau | 2012-04-03 | 2 | -5/+5 |
| | | | | | | | | All python and GRC examples directly associated with a top-level component are now in that examples directory. Examples are split into c++, python, and grc dirs but are all installed into $prefix/share/gnuradio/examples/<component>. | ||||
| * | noaa: py files build from grc. Only installing grc files into examples. | Tom Rondeau | 2012-04-02 | 6 | -1234/+6 |
| | | |||||
| * | noaa: moving apps to examples. | Tom Rondeau | 2012-04-02 | 12 | -1/+1 |
| | | |||||
* | | Removes all references to guile and scheme, which are no longer needed. | Tom Rondeau | 2012-04-01 | 3 | -191/+0 |
|/ | | | | The remaining pmt_serial_tags.scm is parsed by Python already. Future modifications could change this format to not confuse the point. | ||||
* | Merge branch 'master' into next | Johnathan Corgan | 2012-01-18 | 2 | -0/+25 |
|\ | | | | | | | | | Conflicts: gr-noaa/Makefile.am | ||||
| * | noaa: add pkgconfig file for C++ library | Johnathan Corgan | 2012-01-18 | 3 | -0/+27 |
| | | |||||
* | | Removed autotools, gr-waveform, some cleanup | Johnathan Corgan | 2011-12-08 | 15 | -321/+0 |
|/ | | | | Nick Foster owes Nick Corgan a six-pack of beer! | ||||
* | docs: fixes some warnings. | Tom Rondeau | 2011-12-06 | 1 | -3/+3 |
| | | | | There is way too much institutional knowledge in these makefiles now. Another reason I'm glad we're going to cmake, which is being kept more sane as all of the problems are already known. | ||||
* | docs: more fixes for generated swig files. This worked before the merge, but ↵ | Tom Rondeau | 2011-12-05 | 1 | -0/+1 |
| | | | | this forces the build system to generate these before processing the other swig files. | ||||
* | docs: better install of swig docs .i files since we actually have a variable ↵ | Tom Rondeau | 2011-12-04 | 1 | -6/+7 |
| | | | | to take care of it already. | ||||
* | docs: fixing variable for location of header files (SOURCE not BINARY). | Tom Rondeau | 2011-11-30 | 1 | -1/+1 |
| | |||||
* | docs: more appropriate variable to use when setting the include/headers ↵ | Tom Rondeau | 2011-11-28 | 1 | -1/+1 |
| | | | | directory. | ||||
* | docs: installing generated _doc.i files under autotools. | Tom Rondeau | 2011-11-28 | 1 | -0/+3 |
| | |||||
* | docs: better use of BUILT_SOURCES so I'm not overriding the standard build ↵ | Tom Rondeau | 2011-11-27 | 1 | -2/+2 |
| | | | | instructions for it. | ||||
* | docs: Adding swig doc generation to Makefile.am files. | Tom Rondeau | 2011-11-27 | 1 | -0/+9 |
| | |||||
* | docs: forgot to have the generated .i files installed. | Tom Rondeau | 2011-11-27 | 1 | -0/+1 |
| | |||||
* | docs: added python doxygen docs to gr-noaa | Tom Rondeau | 2011-11-27 | 3 | -0/+10 |
| | |||||
* | noaa: updated applications to use gr-uhd | Johnathan Corgan | 2011-10-27 | 14 | -5858/+2608 |
| | | | | Note: LRIT related files were removed; these were never finished | ||||
* | the libraries | Josh Blum | 2011-10-23 | 1 | -8/+1 |
| | |||||
* | usrp: updated installed examples | Josh Blum | 2011-10-19 | 1 | -11/+11 |
| | |||||
* | cmake: fix that component depends on component hack | Josh Blum | 2011-10-19 | 1 | -1/+1 |
| | |||||
* | gr: the CMakeLists.txt took a chill pill | Josh Blum | 2011-10-08 | 5 | -29/+29 |
| | |||||
* | Merge branch 'next' of http://gnuradio.org/git/gnuradio into next | Josh Blum | 2011-09-26 | 1 | -4/+5 |
|\ | |||||
| * | Merge branch 'master' into next | Johnathan Corgan | 2011-09-24 | 1 | -4/+5 |
| |\ | |||||
| | * | gr-noaa: fix PLL to generate output, then update errormaint-3.4.0 | Johnathan Corgan | 2011-09-24 | 1 | -4/+5 |
| | | | |||||
* | | | cmake: language tweak for component group description | Josh Blum | 2011-08-02 | 1 | -1/+1 |
| | | | |||||
* | | | gr: added API macros for noaa and pager, also renamed the ones for digital ↵ | Josh Blum | 2011-07-22 | 7 | -12/+47 |
| | | | | | | | | | | | | and vocoder to be consistent | ||||
* | | | gr: squashed cmakelists.txt into one commit | Josh Blum | 2011-07-20 | 6 | -1/+271 |
|/ / | |||||
* | | Removing docstring generation from this branch. | Ben Reynwar | 2011-02-27 | 1 | -1/+1 |
| | |