diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-27 16:59:13 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-27 16:59:13 -0400 |
| commit | b2e4a3e22fc2f75817a716d7c81e99ef64129bc6 (patch) | |
| tree | c10229fb75d396bae7ea4fb7e633dceabb70ae1d | |
| parent | a7ee9c9f0575580daa0da7a844a09ba65af143e5 (diff) | |
build: remove config.h from any header files; only use it in source files.
| -rw-r--r-- | gnuradio-runtime/include/gr_logger.h | 4 | ||||
| -rw-r--r-- | gnuradio-runtime/include/gr_unittests.h | 4 | ||||
| -rw-r--r-- | gnuradio-runtime/include/pycallback_object.h | 1 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/gr_logger.cc | 4 | ||||
| -rw-r--r-- | gnuradio-runtime/lib/test_runtime.cc | 4 | ||||
| -rw-r--r-- | gnuradio-runtime/swig/runtime_swig.i | 4 | ||||
| -rw-r--r-- | gr-analog/lib/test_gr_analog.cc | 4 | ||||
| -rw-r--r-- | gr-atsc/lib/test_atsci.cc | 4 | ||||
| -rw-r--r-- | gr-blocks/lib/test_gr_blocks.cc | 4 | ||||
| -rw-r--r-- | gr-filter/lib/test_gr_filter.cc | 4 | ||||
| -rw-r--r-- | gr-howto-write-a-block/lib/test_howto.cc | 4 | ||||
| -rw-r--r-- | gr-utils/python/modtool/gr-newmod/lib/test_howto.cc | 4 |
12 files changed, 34 insertions, 11 deletions
diff --git a/gnuradio-runtime/include/gr_logger.h b/gnuradio-runtime/include/gr_logger.h index f3114467d9..5898d0bfad 100644 --- a/gnuradio-runtime/include/gr_logger.h +++ b/gnuradio-runtime/include/gr_logger.h @@ -36,10 +36,6 @@ * */ -#ifndef ENABLE_GR_LOG -#include "config.h" -#endif - #include <gr_runtime_api.h> #include <assert.h> #include <iostream> diff --git a/gnuradio-runtime/include/gr_unittests.h b/gnuradio-runtime/include/gr_unittests.h index 730ca7f884..d160ba3354 100644 --- a/gnuradio-runtime/include/gr_unittests.h +++ b/gnuradio-runtime/include/gr_unittests.h @@ -20,10 +20,6 @@ * Boston, MA 02110-1301, USA. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - #include <gr_runtime_api.h> #include <stdio.h> #include <stdlib.h> diff --git a/gnuradio-runtime/include/pycallback_object.h b/gnuradio-runtime/include/pycallback_object.h index 922e03393e..23782a42be 100644 --- a/gnuradio-runtime/include/pycallback_object.h +++ b/gnuradio-runtime/include/pycallback_object.h @@ -26,7 +26,6 @@ #include <IcePy_Communicator.h> #include <pythread.h> #include <boost/format.hpp> -#include <config.h> enum pyport_t { PYPORT_STRING, diff --git a/gnuradio-runtime/lib/gr_logger.cc b/gnuradio-runtime/lib/gr_logger.cc index 7e0116d036..82737128bb 100644 --- a/gnuradio-runtime/lib/gr_logger.cc +++ b/gnuradio-runtime/lib/gr_logger.cc @@ -26,6 +26,10 @@ * The gr_log module wraps the log4cpp library for logging in gnuradio. *******************************************************************************/ +#ifndef ENABLE_GR_LOG +#include "config.h" +#endif + #include <gr_logger.h> #include <stdexcept> #include <algorithm> diff --git a/gnuradio-runtime/lib/test_runtime.cc b/gnuradio-runtime/lib/test_runtime.cc index bd5378332e..783cbebc0b 100644 --- a/gnuradio-runtime/lib/test_runtime.cc +++ b/gnuradio-runtime/lib/test_runtime.cc @@ -20,6 +20,10 @@ * Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <cppunit/TextTestRunner.h> #include <cppunit/XmlOutputter.h> diff --git a/gnuradio-runtime/swig/runtime_swig.i b/gnuradio-runtime/swig/runtime_swig.i index b7fcc31954..2973d1992f 100644 --- a/gnuradio-runtime/swig/runtime_swig.i +++ b/gnuradio-runtime/swig/runtime_swig.i @@ -36,7 +36,7 @@ #include <gr_endianness.h> #include <gr_block.h> #include <gr_block_detail.h> - //#include <gr_block_gateway.h> +#include <gr_block_gateway.h> #include <gr_buffer.h> #include <gr_constants.h> #include <gr_dispatcher.h> @@ -70,7 +70,7 @@ %include <gr_basic_block.i> %include <gr_block.i> %include <gr_block_detail.i> - //%include <gr_block_gateway.i> +%include <gr_block_gateway.i> %include <gr_buffer.i> %include <gr_constants.i> %include <gr_dispatcher.i> diff --git a/gr-analog/lib/test_gr_analog.cc b/gr-analog/lib/test_gr_analog.cc index 00d6242699..95ee3aa8cb 100644 --- a/gr-analog/lib/test_gr_analog.cc +++ b/gr-analog/lib/test_gr_analog.cc @@ -20,6 +20,10 @@ * Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <cppunit/TextTestRunner.h> #include <cppunit/XmlOutputter.h> diff --git a/gr-atsc/lib/test_atsci.cc b/gr-atsc/lib/test_atsci.cc index 9aeb718cb8..a3703d4d31 100644 --- a/gr-atsc/lib/test_atsci.cc +++ b/gr-atsc/lib/test_atsci.cc @@ -20,6 +20,10 @@ * Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <gr_unittests.h> #include <cppunit/TextTestRunner.h> #include <cppunit/XmlOutputter.h> diff --git a/gr-blocks/lib/test_gr_blocks.cc b/gr-blocks/lib/test_gr_blocks.cc index f03745dc99..14f047fb7b 100644 --- a/gr-blocks/lib/test_gr_blocks.cc +++ b/gr-blocks/lib/test_gr_blocks.cc @@ -20,6 +20,10 @@ * Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <cppunit/TextTestRunner.h> #include <cppunit/XmlOutputter.h> diff --git a/gr-filter/lib/test_gr_filter.cc b/gr-filter/lib/test_gr_filter.cc index 915b6286bd..32978bd317 100644 --- a/gr-filter/lib/test_gr_filter.cc +++ b/gr-filter/lib/test_gr_filter.cc @@ -20,6 +20,10 @@ * Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <cppunit/TextTestRunner.h> #include <cppunit/XmlOutputter.h> diff --git a/gr-howto-write-a-block/lib/test_howto.cc b/gr-howto-write-a-block/lib/test_howto.cc index bf344265d7..9c5faa0eba 100644 --- a/gr-howto-write-a-block/lib/test_howto.cc +++ b/gr-howto-write-a-block/lib/test_howto.cc @@ -20,6 +20,10 @@ * Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <cppunit/TextTestRunner.h> #include <cppunit/XmlOutputter.h> diff --git a/gr-utils/python/modtool/gr-newmod/lib/test_howto.cc b/gr-utils/python/modtool/gr-newmod/lib/test_howto.cc index bf344265d7..9c5faa0eba 100644 --- a/gr-utils/python/modtool/gr-newmod/lib/test_howto.cc +++ b/gr-utils/python/modtool/gr-newmod/lib/test_howto.cc @@ -20,6 +20,10 @@ * Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <cppunit/TextTestRunner.h> #include <cppunit/XmlOutputter.h> |