diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-02 16:02:33 -0700 |
| commit | eea870b1dd9c5b90dfa7d94e6a15ffe44cfbee7f (patch) | |
| tree | af3aa889c94cff9c503edefeaf19cb3635693bfb /gr-vocoder | |
| parent | e648165dcc7609524681b5eaf9620798b75b8420 (diff) | |
| parent | 9acf35715fbb8aca5a991a3f41965db8f4cde683 (diff) | |
Merge branch 'runtime-gruel' into next
Conflicts:
gnuradio-runtime/lib/CMakeLists.txt
Diffstat (limited to 'gr-vocoder')
| -rw-r--r-- | gr-vocoder/include/vocoder/api.h | 2 | ||||
| -rw-r--r-- | gr-vocoder/lib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-vocoder/swig/CMakeLists.txt | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/gr-vocoder/include/vocoder/api.h b/gr-vocoder/include/vocoder/api.h index 331cf5d0bc..613a19f4bc 100644 --- a/gr-vocoder/include/vocoder/api.h +++ b/gr-vocoder/include/vocoder/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_VOCODER_API_H #define INCLUDED_VOCODER_API_H -#include <gruel/attributes.h> +#include <attributes.h> #ifdef gnuradio_vocoder_EXPORTS # define VOCODER_API __GR_ATTR_EXPORT diff --git a/gr-vocoder/lib/CMakeLists.txt b/gr-vocoder/lib/CMakeLists.txt index 4512c19704..08ff4108d3 100644 --- a/gr-vocoder/lib/CMakeLists.txt +++ b/gr-vocoder/lib/CMakeLists.txt @@ -23,7 +23,6 @@ include_directories( ${GR_VOCODER_INCLUDE_DIRS} ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} ${LOG4CXX_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) diff --git a/gr-vocoder/swig/CMakeLists.txt b/gr-vocoder/swig/CMakeLists.txt index 1fa5c0abb7..b3c096597d 100644 --- a/gr-vocoder/swig/CMakeLists.txt +++ b/gr-vocoder/swig/CMakeLists.txt @@ -26,12 +26,12 @@ include(GrSwig) set(GR_SWIG_INCLUDE_DIRS ${GR_VOCODER_INCLUDE_DIRS} ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/vocoder_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/vocoder) +set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_LIBRARIES gnuradio-vocoder) |