summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gr-channels/CMakeLists.txt2
-rw-r--r--gr-channels/include/gnuradio/channels/CMakeLists.txt (renamed from gr-channels/include/channels/CMakeLists.txt)0
-rw-r--r--gr-channels/include/gnuradio/channels/api.h (renamed from gr-channels/include/channels/api.h)0
-rw-r--r--gr-channels/include/gnuradio/channels/channel_model.h (renamed from gr-channels/include/channels/channel_model.h)2
-rw-r--r--gr-channels/include/gnuradio/channels/fading_model.h (renamed from gr-channels/include/channels/fading_model.h)2
-rw-r--r--gr-channels/lib/channel_model_impl.h2
-rw-r--r--gr-channels/lib/fading_model_impl.h2
-rw-r--r--gr-channels/swig/CMakeLists.txt2
-rw-r--r--gr-channels/swig/channels_swig.i8
9 files changed, 10 insertions, 10 deletions
diff --git a/gr-channels/CMakeLists.txt b/gr-channels/CMakeLists.txt
index f73f49565f..b7df5deee7 100644
--- a/gr-channels/CMakeLists.txt
+++ b/gr-channels/CMakeLists.txt
@@ -84,7 +84,7 @@ CPACK_COMPONENT("channels_swig"
########################################################################
# Add subdirectories
########################################################################
-add_subdirectory(include/channels)
+add_subdirectory(include/gnuradio/channels)
add_subdirectory(lib)
if(ENABLE_PYTHON)
add_subdirectory(swig)
diff --git a/gr-channels/include/channels/CMakeLists.txt b/gr-channels/include/gnuradio/channels/CMakeLists.txt
index c0c70e2b00..c0c70e2b00 100644
--- a/gr-channels/include/channels/CMakeLists.txt
+++ b/gr-channels/include/gnuradio/channels/CMakeLists.txt
diff --git a/gr-channels/include/channels/api.h b/gr-channels/include/gnuradio/channels/api.h
index 1fd1d9ba8f..1fd1d9ba8f 100644
--- a/gr-channels/include/channels/api.h
+++ b/gr-channels/include/gnuradio/channels/api.h
diff --git a/gr-channels/include/channels/channel_model.h b/gr-channels/include/gnuradio/channels/channel_model.h
index d41545c1c4..8b533ac7da 100644
--- a/gr-channels/include/channels/channel_model.h
+++ b/gr-channels/include/gnuradio/channels/channel_model.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_CHANNELS_CHANNEL_MODEL_H
#define INCLUDED_CHANNELS_CHANNEL_MODEL_H
-#include <channels/api.h>
+#include <gnuradio/channels/api.h>
#include <gnuradio/hier_block2.h>
#include <gnuradio/types.h>
diff --git a/gr-channels/include/channels/fading_model.h b/gr-channels/include/gnuradio/channels/fading_model.h
index a6037535c7..c5946d3598 100644
--- a/gr-channels/include/channels/fading_model.h
+++ b/gr-channels/include/gnuradio/channels/fading_model.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_CHANNELS_FADING_MODEL_H
#define INCLUDED_CHANNELS_FADING_MODEL_H
-#include <channels/api.h>
+#include <gnuradio/channels/api.h>
#include <gnuradio/sync_block.h>
#include <gnuradio/types.h>
diff --git a/gr-channels/lib/channel_model_impl.h b/gr-channels/lib/channel_model_impl.h
index b50ef1cb5c..37856a4b84 100644
--- a/gr-channels/lib/channel_model_impl.h
+++ b/gr-channels/lib/channel_model_impl.h
@@ -28,7 +28,7 @@
#include <gnuradio/blocks/multiply_cc.h>
#include <gnuradio/analog/sig_source_c.h>
#include <gnuradio/analog/fastnoise_source_c.h>
-#include <channels/channel_model.h>
+#include <gnuradio/channels/channel_model.h>
#include <filter/fractional_interpolator_cc.h>
#include <filter/fir_filter_ccc.h>
diff --git a/gr-channels/lib/fading_model_impl.h b/gr-channels/lib/fading_model_impl.h
index cad5a42fb2..3b816b6679 100644
--- a/gr-channels/lib/fading_model_impl.h
+++ b/gr-channels/lib/fading_model_impl.h
@@ -24,7 +24,7 @@
#define INCLUDED_CHANNELS_CHANNEL_MODEL_IMPL_H
#include <gnuradio/sync_block.h>
-#include <channels/fading_model.h>
+#include <gnuradio/channels/fading_model.h>
//#include <iostream>
#include <boost/format.hpp>
diff --git a/gr-channels/swig/CMakeLists.txt b/gr-channels/swig/CMakeLists.txt
index fda2da66f2..5f5091f342 100644
--- a/gr-channels/swig/CMakeLists.txt
+++ b/gr-channels/swig/CMakeLists.txt
@@ -36,7 +36,7 @@ if(ENABLE_GR_CTRLPORT)
endif(ENABLE_GR_CTRLPORT)
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/channels_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/channels)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/channels)
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
set(GR_SWIG_LIBRARIES gnuradio-channels)
diff --git a/gr-channels/swig/channels_swig.i b/gr-channels/swig/channels_swig.i
index bfd0f9a10a..4cf3e13638 100644
--- a/gr-channels/swig/channels_swig.i
+++ b/gr-channels/swig/channels_swig.i
@@ -28,12 +28,12 @@
%include "channels_swig_doc.i"
%{
-#include "channels/channel_model.h"
-#include "channels/fading_model.h"
+#include "gnuradio/channels/channel_model.h"
+#include "gnuradio/channels/fading_model.h"
%}
-%include "channels/channel_model.h"
-%include "channels/fading_model.h"
+%include "gnuradio/channels/channel_model.h"
+%include "gnuradio/channels/fading_model.h"
GR_SWIG_BLOCK_MAGIC2(channels, channel_model);
GR_SWIG_BLOCK_MAGIC2(channels, fading_model);