diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-30 13:18:25 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-30 13:18:25 -0700 |
| commit | 02fbc046244f158adc1c5d8eb2dd28f34b729b01 (patch) | |
| tree | c882865ca3b5ad74cadad2a513c9947cba340a00 | |
| parent | ef43e123bdf1aa91220f1026e5f9872f5e255928 (diff) | |
video_sdl: moved include dir to gnuradio/video_sdl
| -rw-r--r-- | gr-video-sdl/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-video-sdl/include/gnuradio/video_sdl/CMakeLists.txt (renamed from gr-video-sdl/include/video_sdl/CMakeLists.txt) | 0 | ||||
| -rw-r--r-- | gr-video-sdl/include/gnuradio/video_sdl/api.h (renamed from gr-video-sdl/include/video_sdl/api.h) | 0 | ||||
| -rw-r--r-- | gr-video-sdl/include/gnuradio/video_sdl/sink_s.h (renamed from gr-video-sdl/include/video_sdl/sink_s.h) | 2 | ||||
| -rw-r--r-- | gr-video-sdl/include/gnuradio/video_sdl/sink_uc.h (renamed from gr-video-sdl/include/video_sdl/sink_uc.h) | 2 | ||||
| -rw-r--r-- | gr-video-sdl/lib/sink_s_impl.h | 2 | ||||
| -rw-r--r-- | gr-video-sdl/lib/sink_uc_impl.h | 2 | ||||
| -rw-r--r-- | gr-video-sdl/swig/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-video-sdl/swig/video_sdl_swig.i | 8 |
9 files changed, 10 insertions, 10 deletions
diff --git a/gr-video-sdl/CMakeLists.txt b/gr-video-sdl/CMakeLists.txt index d0f230892c..82fab5c41e 100644 --- a/gr-video-sdl/CMakeLists.txt +++ b/gr-video-sdl/CMakeLists.txt @@ -81,7 +81,7 @@ CPACK_COMPONENT("video_sdl_swig" ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/video_sdl) +add_subdirectory(include/gnuradio/video_sdl) add_subdirectory(lib) if(ENABLE_PYTHON) add_subdirectory(swig) diff --git a/gr-video-sdl/include/video_sdl/CMakeLists.txt b/gr-video-sdl/include/gnuradio/video_sdl/CMakeLists.txt index 8831fd8172..8831fd8172 100644 --- a/gr-video-sdl/include/video_sdl/CMakeLists.txt +++ b/gr-video-sdl/include/gnuradio/video_sdl/CMakeLists.txt diff --git a/gr-video-sdl/include/video_sdl/api.h b/gr-video-sdl/include/gnuradio/video_sdl/api.h index b9df5fd060..b9df5fd060 100644 --- a/gr-video-sdl/include/video_sdl/api.h +++ b/gr-video-sdl/include/gnuradio/video_sdl/api.h diff --git a/gr-video-sdl/include/video_sdl/sink_s.h b/gr-video-sdl/include/gnuradio/video_sdl/sink_s.h index 076f065f07..bc5b6eea13 100644 --- a/gr-video-sdl/include/video_sdl/sink_s.h +++ b/gr-video-sdl/include/gnuradio/video_sdl/sink_s.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VIDEO_SDL_SINK_S_H #define INCLUDED_VIDEO_SDL_SINK_S_H -#include <video_sdl/api.h> +#include <gnuradio/video_sdl/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-video-sdl/include/video_sdl/sink_uc.h b/gr-video-sdl/include/gnuradio/video_sdl/sink_uc.h index 5db316a21f..222eb117e0 100644 --- a/gr-video-sdl/include/video_sdl/sink_uc.h +++ b/gr-video-sdl/include/gnuradio/video_sdl/sink_uc.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VIDEO_SDL_SINK_UC_H #define INCLUDED_VIDEO_SDL_SINK_UC_H -#include <video_sdl/api.h> +#include <gnuradio/video_sdl/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-video-sdl/lib/sink_s_impl.h b/gr-video-sdl/lib/sink_s_impl.h index 8d20cb6596..3160d9e218 100644 --- a/gr-video-sdl/lib/sink_s_impl.h +++ b/gr-video-sdl/lib/sink_s_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VIDEO_SDL_SINK_S_IMPL_H #define INCLUDED_VIDEO_SDL_SINK_S_IMPL_H -#include <video_sdl/sink_s.h> +#include <gnuradio/video_sdl/sink_s.h> #include <SDL.h> namespace gr { diff --git a/gr-video-sdl/lib/sink_uc_impl.h b/gr-video-sdl/lib/sink_uc_impl.h index 927510745f..c1a79b0d25 100644 --- a/gr-video-sdl/lib/sink_uc_impl.h +++ b/gr-video-sdl/lib/sink_uc_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_VIDEO_SDL_SINK_UC_IMPL_H #define INCLUDED_VIDEO_SDL_SINK_UC_IMPL_H -#include <video_sdl/sink_uc.h> +#include <gnuradio/video_sdl/sink_uc.h> #include <SDL.h> namespace gr { diff --git a/gr-video-sdl/swig/CMakeLists.txt b/gr-video-sdl/swig/CMakeLists.txt index 26169bf0b9..df64cb38d3 100644 --- a/gr-video-sdl/swig/CMakeLists.txt +++ b/gr-video-sdl/swig/CMakeLists.txt @@ -39,7 +39,7 @@ endif(ENABLE_GR_CTRLPORT) # Setup swig docs to depend on includes and pull in from build directory set(GR_SWIG_TARGET_DEPS video_sdl_generated_includes) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/video_sdl_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/video_sdl) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/video_sdl) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_LIBRARIES gnuradio-video-sdl) diff --git a/gr-video-sdl/swig/video_sdl_swig.i b/gr-video-sdl/swig/video_sdl_swig.i index d66201d670..f5db34151a 100644 --- a/gr-video-sdl/swig/video_sdl_swig.i +++ b/gr-video-sdl/swig/video_sdl_swig.i @@ -28,12 +28,12 @@ %include "video_sdl_swig_doc.i" %{ -#include "video_sdl/sink_uc.h" -#include "video_sdl/sink_s.h" +#include "gnuradio/video_sdl/sink_uc.h" +#include "gnuradio/video_sdl/sink_s.h" %} -%include "video_sdl/sink_uc.h" -%include "video_sdl/sink_s.h" +%include "gnuradio/video_sdl/sink_uc.h" +%include "gnuradio/video_sdl/sink_s.h" GR_SWIG_BLOCK_MAGIC2(video_sdl, sink_uc); GR_SWIG_BLOCK_MAGIC2(video_sdl, sink_s); |