diff options
15 files changed, 22 insertions, 22 deletions
diff --git a/gr-pager/CMakeLists.txt b/gr-pager/CMakeLists.txt index 48c11d6840..04c7e2c504 100644 --- a/gr-pager/CMakeLists.txt +++ b/gr-pager/CMakeLists.txt @@ -91,7 +91,7 @@ CPACK_COMPONENT("pager_swig" ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/pager) +add_subdirectory(include/gnuradio/pager) add_subdirectory(lib) if(ENABLE_PYTHON) add_subdirectory(python) diff --git a/gr-pager/include/pager/CMakeLists.txt b/gr-pager/include/gnuradio/pager/CMakeLists.txt index 6577e7f4e6..6577e7f4e6 100644 --- a/gr-pager/include/pager/CMakeLists.txt +++ b/gr-pager/include/gnuradio/pager/CMakeLists.txt diff --git a/gr-pager/include/pager/api.h b/gr-pager/include/gnuradio/pager/api.h index 3d76e6761a..3d76e6761a 100644 --- a/gr-pager/include/pager/api.h +++ b/gr-pager/include/gnuradio/pager/api.h diff --git a/gr-pager/include/pager/flex_deinterleave.h b/gr-pager/include/gnuradio/pager/flex_deinterleave.h index 9b394d85cd..2b0c4353d6 100644 --- a/gr-pager/include/pager/flex_deinterleave.h +++ b/gr-pager/include/gnuradio/pager/flex_deinterleave.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_PAGER_FLEX_DEINTERLEAVE_H #define INCLUDED_PAGER_FLEX_DEINTERLEAVE_H -#include <pager/api.h> +#include <gnuradio/pager/api.h> #include <gnuradio/sync_decimator.h> namespace gr { diff --git a/gr-pager/include/pager/flex_frame.h b/gr-pager/include/gnuradio/pager/flex_frame.h index 7e2dd3e0a6..7245c9a00c 100644 --- a/gr-pager/include/pager/flex_frame.h +++ b/gr-pager/include/gnuradio/pager/flex_frame.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_PAGER_FLEX_FRAME_H #define INCLUDED_PAGER_FLEX_FRAME_H -#include <pager/api.h> +#include <gnuradio/pager/api.h> #include <boost/shared_ptr.hpp> namespace gr { diff --git a/gr-pager/include/pager/flex_parse.h b/gr-pager/include/gnuradio/pager/flex_parse.h index 9594528377..42adaff6e0 100644 --- a/gr-pager/include/pager/flex_parse.h +++ b/gr-pager/include/gnuradio/pager/flex_parse.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_PAGER_FLEX_PARSE_H #define INCLUDED_PAGER_FLEX_PARSE_H -#include <pager/api.h> +#include <gnuradio/pager/api.h> #include <gnuradio/sync_block.h> #include <gnuradio/msg_queue.h> #include <sstream> diff --git a/gr-pager/include/pager/flex_sync.h b/gr-pager/include/gnuradio/pager/flex_sync.h index 3d0f1dd5ff..54c3d827a2 100644 --- a/gr-pager/include/pager/flex_sync.h +++ b/gr-pager/include/gnuradio/pager/flex_sync.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_PAGER_FLEX_SYNC_H #define INCLUDED_PAGER_FLEX_SYNC_H -#include <pager/api.h> +#include <gnuradio/pager/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/gr-pager/include/pager/slicer_fb.h b/gr-pager/include/gnuradio/pager/slicer_fb.h index 66fcbd37e6..6f01a254c3 100644 --- a/gr-pager/include/pager/slicer_fb.h +++ b/gr-pager/include/gnuradio/pager/slicer_fb.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_PAGER_SLICER_FB_H #define INCLUDED_PAGER_SLICER_FB_H -#include <pager/api.h> +#include <gnuradio/pager/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-pager/lib/flex_deinterleave_impl.h b/gr-pager/lib/flex_deinterleave_impl.h index defa83b395..79aabf4320 100644 --- a/gr-pager/lib/flex_deinterleave_impl.h +++ b/gr-pager/lib/flex_deinterleave_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_PAGER_FLEX_DEINTERLEAVE_IMPL_H #define INCLUDED_PAGER_FLEX_DEINTERLEAVE_IMPL_H -#include <pager/flex_deinterleave.h> +#include <gnuradio/pager/flex_deinterleave.h> #include <gnuradio/sync_decimator.h> namespace gr { diff --git a/gr-pager/lib/flex_frame_impl.h b/gr-pager/lib/flex_frame_impl.h index 0a6ec80293..e7d1139041 100644 --- a/gr-pager/lib/flex_frame_impl.h +++ b/gr-pager/lib/flex_frame_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_PAGER_FLEX_FRAME_IMPL_H #define INCLUDED_PAGER_FLEX_FRAME_IMPL_H -#include <pager/flex_frame.h> +#include <gnuradio/pager/flex_frame.h> namespace gr { namespace pager { diff --git a/gr-pager/lib/flex_parse_impl.h b/gr-pager/lib/flex_parse_impl.h index f741957f90..f2e4236c56 100644 --- a/gr-pager/lib/flex_parse_impl.h +++ b/gr-pager/lib/flex_parse_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_PAGER_FLEX_PARSE_IMPL_H #define INCLUDED_PAGER_FLEX_PARSE_IMPL_H -#include <pager/flex_parse.h> +#include <gnuradio/pager/flex_parse.h> #include <gnuradio/sync_block.h> #include <gnuradio/msg_queue.h> #include "flex_modes.h" diff --git a/gr-pager/lib/flex_sync_impl.h b/gr-pager/lib/flex_sync_impl.h index ba18c147dc..9bc5111e7f 100644 --- a/gr-pager/lib/flex_sync_impl.h +++ b/gr-pager/lib/flex_sync_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_PAGER_FLEX_SYNC_IMPL_H #define INCLUDED_PAGER_FLEX_SYNC_IMPL_H -#include <pager/flex_sync.h> +#include <gnuradio/pager/flex_sync.h> namespace gr { namespace pager { diff --git a/gr-pager/lib/slicer_fb_impl.h b/gr-pager/lib/slicer_fb_impl.h index c758a4b160..d2d6ba7d89 100644 --- a/gr-pager/lib/slicer_fb_impl.h +++ b/gr-pager/lib/slicer_fb_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_PAGER_SLICER_FB_IMPL_H #define INCLUDED_PAGER_SLICER_FB_IMPL_H -#include <pager/slicer_fb.h> +#include <gnuradio/pager/slicer_fb.h> namespace gr { namespace pager { diff --git a/gr-pager/swig/CMakeLists.txt b/gr-pager/swig/CMakeLists.txt index 076b5387fb..b63c45c15d 100644 --- a/gr-pager/swig/CMakeLists.txt +++ b/gr-pager/swig/CMakeLists.txt @@ -35,7 +35,7 @@ if(ENABLE_GR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/pager_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/pager) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/pager) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_LIBRARIES gnuradio-pager) diff --git a/gr-pager/swig/pager_swig.i b/gr-pager/swig/pager_swig.i index b558d5a6cd..cacd993e9a 100644 --- a/gr-pager/swig/pager_swig.i +++ b/gr-pager/swig/pager_swig.i @@ -27,18 +27,18 @@ %include "pager_swig_doc.i" %{ -#include "pager/flex_frame.h" -#include "pager/slicer_fb.h" -#include "pager/flex_sync.h" -#include "pager/flex_deinterleave.h" -#include "pager/flex_parse.h" +#include "gnuradio/pager/flex_frame.h" +#include "gnuradio/pager/slicer_fb.h" +#include "gnuradio/pager/flex_sync.h" +#include "gnuradio/pager/flex_deinterleave.h" +#include "gnuradio/pager/flex_parse.h" %} -%include "pager/flex_frame.h" -%include "pager/slicer_fb.h" -%include "pager/flex_sync.h" -%include "pager/flex_deinterleave.h" -%include "pager/flex_parse.h" +%include "gnuradio/pager/flex_frame.h" +%include "gnuradio/pager/slicer_fb.h" +%include "gnuradio/pager/flex_sync.h" +%include "gnuradio/pager/flex_deinterleave.h" +%include "gnuradio/pager/flex_parse.h" GR_SWIG_BLOCK_MAGIC2(pager, flex_frame); GR_SWIG_BLOCK_MAGIC2(pager, slicer_fb); |