diff options
15 files changed, 24 insertions, 24 deletions
diff --git a/gr-wxgui/CMakeLists.txt b/gr-wxgui/CMakeLists.txt index 5140db5658..25382638c5 100644 --- a/gr-wxgui/CMakeLists.txt +++ b/gr-wxgui/CMakeLists.txt @@ -94,7 +94,7 @@ install( ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/wxgui) +add_subdirectory(include/gnuradio/wxgui) add_subdirectory(lib) add_subdirectory(grc) add_subdirectory(swig) diff --git a/gr-wxgui/include/wxgui/CMakeLists.txt b/gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt index fad84792e1..fad84792e1 100644 --- a/gr-wxgui/include/wxgui/CMakeLists.txt +++ b/gr-wxgui/include/gnuradio/wxgui/CMakeLists.txt diff --git a/gr-wxgui/include/wxgui/api.h b/gr-wxgui/include/gnuradio/wxgui/api.h index 6439c8e591..6439c8e591 100644 --- a/gr-wxgui/include/wxgui/api.h +++ b/gr-wxgui/include/gnuradio/wxgui/api.h diff --git a/gr-wxgui/include/wxgui/histo_sink_f.h b/gr-wxgui/include/gnuradio/wxgui/histo_sink_f.h index 351f629460..30f0bc7c0d 100644 --- a/gr-wxgui/include/wxgui/histo_sink_f.h +++ b/gr-wxgui/include/gnuradio/wxgui/histo_sink_f.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_HISTO_SINK_F_H #define INCLUDED_GR_HISTO_SINK_F_H -#include <wxgui/api.h> +#include <gnuradio/wxgui/api.h> #include <gnuradio/sync_block.h> #include <gnuradio/msg_queue.h> diff --git a/gr-wxgui/include/wxgui/oscope_guts.h b/gr-wxgui/include/gnuradio/wxgui/oscope_guts.h index 6ba23a6587..c1a521acf2 100644 --- a/gr-wxgui/include/wxgui/oscope_guts.h +++ b/gr-wxgui/include/gnuradio/wxgui/oscope_guts.h @@ -24,8 +24,8 @@ #ifndef INCLUDED_GR_OSCOPE_GUTS_H #define INCLUDED_GR_OSCOPE_GUTS_H -#include <wxgui/api.h> -#include <wxgui/trigger_mode.h> +#include <gnuradio/wxgui/api.h> +#include <gnuradio/wxgui/trigger_mode.h> #include <gnuradio/msg_queue.h> namespace gr { diff --git a/gr-wxgui/include/wxgui/oscope_sink_f.h b/gr-wxgui/include/gnuradio/wxgui/oscope_sink_f.h index 544c580ca7..9e86442055 100644 --- a/gr-wxgui/include/wxgui/oscope_sink_f.h +++ b/gr-wxgui/include/gnuradio/wxgui/oscope_sink_f.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_GR_OSCOPE_SINK_F_H #define INCLUDED_GR_OSCOPE_SINK_F_H -#include <wxgui/api.h> -#include <wxgui/oscope_sink_x.h> +#include <gnuradio/wxgui/api.h> +#include <gnuradio/wxgui/oscope_sink_x.h> #include <gnuradio/msg_queue.h> namespace gr { diff --git a/gr-wxgui/include/wxgui/oscope_sink_x.h b/gr-wxgui/include/gnuradio/wxgui/oscope_sink_x.h index 41d1376811..b72c1dd370 100644 --- a/gr-wxgui/include/wxgui/oscope_sink_x.h +++ b/gr-wxgui/include/gnuradio/wxgui/oscope_sink_x.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_GR_OSCOPE_SINK_X_H #define INCLUDED_GR_OSCOPE_SINK_X_H -#include <wxgui/api.h> -#include <wxgui/trigger_mode.h> -#include <wxgui/oscope_guts.h> +#include <gnuradio/wxgui/api.h> +#include <gnuradio/wxgui/trigger_mode.h> +#include <gnuradio/wxgui/oscope_guts.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-wxgui/include/wxgui/trigger_mode.h b/gr-wxgui/include/gnuradio/wxgui/trigger_mode.h index 11654ef6c5..11654ef6c5 100644 --- a/gr-wxgui/include/wxgui/trigger_mode.h +++ b/gr-wxgui/include/gnuradio/wxgui/trigger_mode.h diff --git a/gr-wxgui/lib/histo_sink_f_impl.h b/gr-wxgui/lib/histo_sink_f_impl.h index 64530dd19f..6c16a8a465 100644 --- a/gr-wxgui/lib/histo_sink_f_impl.h +++ b/gr-wxgui/lib/histo_sink_f_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_HISTO_SINK_F_IMPL_H #define INCLUDED_GR_HISTO_SINK_F_IMPL_H -#include <wxgui/histo_sink_f.h> +#include <gnuradio/wxgui/histo_sink_f.h> namespace gr { namespace wxgui { diff --git a/gr-wxgui/lib/oscope_guts.cc b/gr-wxgui/lib/oscope_guts.cc index 5cec521023..d406932dae 100644 --- a/gr-wxgui/lib/oscope_guts.cc +++ b/gr-wxgui/lib/oscope_guts.cc @@ -24,7 +24,7 @@ #include <config.h> #endif -#include <wxgui/oscope_guts.h> +#include <gnuradio/wxgui/oscope_guts.h> #include <stdexcept> #include <stdio.h> #include <algorithm> diff --git a/gr-wxgui/lib/oscope_sink_f_impl.cc b/gr-wxgui/lib/oscope_sink_f_impl.cc index 2436fa1c4d..9993040ffd 100644 --- a/gr-wxgui/lib/oscope_sink_f_impl.cc +++ b/gr-wxgui/lib/oscope_sink_f_impl.cc @@ -25,8 +25,8 @@ #endif #include "oscope_sink_f_impl.h" -#include <wxgui/oscope_sink_x.h> -#include <wxgui/oscope_guts.h> +#include <gnuradio/wxgui/oscope_sink_x.h> +#include <gnuradio/wxgui/oscope_guts.h> #include <gnuradio/io_signature.h> namespace gr { diff --git a/gr-wxgui/lib/oscope_sink_f_impl.h b/gr-wxgui/lib/oscope_sink_f_impl.h index efab9fcec3..81688f53a5 100644 --- a/gr-wxgui/lib/oscope_sink_f_impl.h +++ b/gr-wxgui/lib/oscope_sink_f_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_GR_OSCOPE_SINK_F_IMPL_H #define INCLUDED_GR_OSCOPE_SINK_F_IMPL_H -#include <wxgui/oscope_sink_f.h> +#include <gnuradio/wxgui/oscope_sink_f.h> namespace gr { namespace wxgui { diff --git a/gr-wxgui/lib/oscope_sink_x.cc b/gr-wxgui/lib/oscope_sink_x.cc index d8327beb98..c97495fe53 100644 --- a/gr-wxgui/lib/oscope_sink_x.cc +++ b/gr-wxgui/lib/oscope_sink_x.cc @@ -24,8 +24,8 @@ #include "config.h" #endif -#include <wxgui/oscope_sink_x.h> -#include <wxgui/oscope_guts.h> +#include <gnuradio/wxgui/oscope_sink_x.h> +#include <gnuradio/wxgui/oscope_guts.h> #include <gnuradio/io_signature.h> namespace gr { diff --git a/gr-wxgui/swig/CMakeLists.txt b/gr-wxgui/swig/CMakeLists.txt index c7f5bcd96c..f02f1f1455 100644 --- a/gr-wxgui/swig/CMakeLists.txt +++ b/gr-wxgui/swig/CMakeLists.txt @@ -36,7 +36,7 @@ if(ENABLE_GR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/wxgui_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/wxgui) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/wxgui) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_TARGET_DEPS wxgui_generated_includes) set(GR_SWIG_LIBRARIES gnuradio-wxgui) diff --git a/gr-wxgui/swig/wxgui_swig.i b/gr-wxgui/swig/wxgui_swig.i index 69c1887a46..2051dd45eb 100644 --- a/gr-wxgui/swig/wxgui_swig.i +++ b/gr-wxgui/swig/wxgui_swig.i @@ -27,17 +27,17 @@ //load generated python docstrings %include "wxgui_swig_doc.i" -%include "wxgui/trigger_mode.h" +%include "gnuradio/wxgui/trigger_mode.h" %{ -#include "wxgui/oscope_sink_x.h" -#include "wxgui/histo_sink_f.h" -#include "wxgui/oscope_sink_f.h" +#include "gnuradio/wxgui/oscope_sink_x.h" +#include "gnuradio/wxgui/histo_sink_f.h" +#include "gnuradio/wxgui/oscope_sink_f.h" %} -%include "wxgui/oscope_sink_x.h" -%include "wxgui/histo_sink_f.h" -%include "wxgui/oscope_sink_f.h" +%include "gnuradio/wxgui/oscope_sink_x.h" +%include "gnuradio/wxgui/histo_sink_f.h" +%include "gnuradio/wxgui/oscope_sink_f.h" GR_SWIG_BLOCK_MAGIC2(wxgui, histo_sink_f); GR_SWIG_BLOCK_MAGIC2(wxgui, oscope_sink_f); |