diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-29 20:36:11 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-29 20:36:11 -0700 |
| commit | a23eb76138baad68e2a6eb6a53b2d7f87bc1288a (patch) | |
| tree | 06601a82dcc350c2c1f88ea0899c035196c88d39 | |
| parent | 1875bea6c499de3a9b421aba1bd846a63611b469 (diff) | |
comedi: moved include dir to gnuradio/comedi
| -rw-r--r-- | gr-comedi/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-comedi/include/gnuradio/comedi/CMakeLists.txt (renamed from gr-comedi/include/comedi/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | gr-comedi/include/gnuradio/comedi/api.h (renamed from gr-comedi/include/comedi/api.h) | 0 | ||||
| -rw-r--r-- | gr-comedi/include/gnuradio/comedi/sink_s.h (renamed from gr-comedi/include/comedi/sink_s.h) | 2 | ||||
| -rw-r--r-- | gr-comedi/include/gnuradio/comedi/source_s.h (renamed from gr-comedi/include/comedi/source_s.h) | 2 | ||||
| -rw-r--r-- | gr-comedi/lib/sink_s_impl.h | 2 | ||||
| -rw-r--r-- | gr-comedi/lib/source_s_impl.h | 2 | ||||
| -rw-r--r-- | gr-comedi/swig/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-comedi/swig/comedi_swig.i | 8 |
9 files changed, 10 insertions, 10 deletions
diff --git a/gr-comedi/CMakeLists.txt b/gr-comedi/CMakeLists.txt index 1cd89b8144..d54f44c29d 100644 --- a/gr-comedi/CMakeLists.txt +++ b/gr-comedi/CMakeLists.txt @@ -88,7 +88,7 @@ CPACK_COMPONENT("comedi_swig" ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/comedi) +add_subdirectory(include/gnuradio/comedi) add_subdirectory(lib) if(ENABLE_PYTHON) add_subdirectory(swig) diff --git a/gr-comedi/include/comedi/CMakeLists.txt b/gr-comedi/include/gnuradio/comedi/CMakeLists.txt index 51a609e421..51a609e421 100644 --- a/gr-comedi/include/comedi/CMakeLists.txt +++ b/gr-comedi/include/gnuradio/comedi/CMakeLists.txt diff --git a/gr-comedi/include/comedi/api.h b/gr-comedi/include/gnuradio/comedi/api.h index 1afaf0d18c..1afaf0d18c 100644 --- a/gr-comedi/include/comedi/api.h +++ b/gr-comedi/include/gnuradio/comedi/api.h diff --git a/gr-comedi/include/comedi/sink_s.h b/gr-comedi/include/gnuradio/comedi/sink_s.h index 3996957dde..e5aa6dcd33 100644 --- a/gr-comedi/include/comedi/sink_s.h +++ b/gr-comedi/include/gnuradio/comedi/sink_s.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_COMEDI_SINK_H #define INCLUDED_COMEDI_SINK_H -#include <comedi/api.h> +#include <gnuradio/comedi/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-comedi/include/comedi/source_s.h b/gr-comedi/include/gnuradio/comedi/source_s.h index 25276948e1..84c98517ce 100644 --- a/gr-comedi/include/comedi/source_s.h +++ b/gr-comedi/include/gnuradio/comedi/source_s.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_COMEDI_SOURCE_S_H #define INCLUDED_COMEDI_SOURCE_S_H -#include <comedi/api.h> +#include <gnuradio/comedi/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-comedi/lib/sink_s_impl.h b/gr-comedi/lib/sink_s_impl.h index 6d57591ed0..22838a812b 100644 --- a/gr-comedi/lib/sink_s_impl.h +++ b/gr-comedi/lib/sink_s_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_COMEDI_SINK_IMPL_H #define INCLUDED_COMEDI_SINK_IMPL_H -#include <comedi/sink_s.h> +#include <gnuradio/comedi/sink_s.h> #include <string> #include <comedilib.h> #include <stdexcept> diff --git a/gr-comedi/lib/source_s_impl.h b/gr-comedi/lib/source_s_impl.h index e5b062323f..47e78c70e7 100644 --- a/gr-comedi/lib/source_s_impl.h +++ b/gr-comedi/lib/source_s_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_COMEDI_SOURCE_S_IMPL_H #define INCLUDED_COMEDI_SOURCE_S_IMPL_H -#include <comedi/source_s.h> +#include <gnuradio/comedi/source_s.h> #include <string> #include <comedilib.h> #include <stdexcept> diff --git a/gr-comedi/swig/CMakeLists.txt b/gr-comedi/swig/CMakeLists.txt index 42e6286709..0c275cc48e 100644 --- a/gr-comedi/swig/CMakeLists.txt +++ b/gr-comedi/swig/CMakeLists.txt @@ -37,7 +37,7 @@ endif(ENABLE_GR_CTRLPORT) # Setup swig docs to depend on includes and pull in from build directory set(GR_SWIG_TARGET_DEPS comedi_generated_includes) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/comedi_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/comedi) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/comedi) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_LIBRARIES gnuradio-comedi) diff --git a/gr-comedi/swig/comedi_swig.i b/gr-comedi/swig/comedi_swig.i index 179882991a..f15873b830 100644 --- a/gr-comedi/swig/comedi_swig.i +++ b/gr-comedi/swig/comedi_swig.i @@ -28,12 +28,12 @@ %include "comedi_swig_doc.i" %{ -#include "comedi/sink_s.h" -#include "comedi/source_s.h" +#include "gnuradio/comedi/sink_s.h" +#include "gnuradio/comedi/source_s.h" %} -%include "comedi/sink_s.h" -%include "comedi/source_s.h" +%include "gnuradio/comedi/sink_s.h" +%include "gnuradio/comedi/source_s.h" GR_SWIG_BLOCK_MAGIC2(comedi, sink_s); GR_SWIG_BLOCK_MAGIC2(comedi, source_s); |