summaryrefslogtreecommitdiff
path: root/gr-fft
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2013-04-29 21:40:31 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2013-04-29 21:40:31 -0700
commit56f03bb3ae5d72397c4e0fe860629c6cab3d95b0 (patch)
treeae4a7260be0d3c75e9b85b47efbf26b6b20e4352 /gr-fft
parent7d52216a3d789b6d0192686095c709462e827292 (diff)
fft: moved include dir to gnuradio/fft
Diffstat (limited to 'gr-fft')
-rw-r--r--gr-fft/CMakeLists.txt2
-rw-r--r--gr-fft/include/gnuradio/fft/CMakeLists.txt (renamed from gr-fft/include/fft/CMakeLists.txt)0
-rw-r--r--gr-fft/include/gnuradio/fft/api.h (renamed from gr-fft/include/fft/api.h)0
-rw-r--r--gr-fft/include/gnuradio/fft/fft.h (renamed from gr-fft/include/fft/fft.h)2
-rw-r--r--gr-fft/include/gnuradio/fft/fft_vcc.h (renamed from gr-fft/include/fft/fft_vcc.h)2
-rw-r--r--gr-fft/include/gnuradio/fft/fft_vfc.h (renamed from gr-fft/include/fft/fft_vfc.h)2
-rw-r--r--gr-fft/include/gnuradio/fft/goertzel.h (renamed from gr-fft/include/fft/goertzel.h)2
-rw-r--r--gr-fft/include/gnuradio/fft/goertzel_fc.h (renamed from gr-fft/include/fft/goertzel_fc.h)2
-rw-r--r--gr-fft/lib/fft.cc2
-rw-r--r--gr-fft/lib/fft_vcc_fftw.h4
-rw-r--r--gr-fft/lib/fft_vfc_fftw.h4
-rw-r--r--gr-fft/lib/goertzel.cc2
-rw-r--r--gr-fft/lib/goertzel_fc_impl.h4
-rw-r--r--gr-fft/swig/CMakeLists.txt2
-rw-r--r--gr-fft/swig/fft_swig.i12
15 files changed, 21 insertions, 21 deletions
diff --git a/gr-fft/CMakeLists.txt b/gr-fft/CMakeLists.txt
index e9732eb30b..6bd08b257a 100644
--- a/gr-fft/CMakeLists.txt
+++ b/gr-fft/CMakeLists.txt
@@ -84,7 +84,7 @@ CPACK_COMPONENT("fft_swig"
########################################################################
# Add subdirectories
########################################################################
-add_subdirectory(include/fft)
+add_subdirectory(include/gnuradio/fft)
add_subdirectory(lib)
if(ENABLE_PYTHON)
add_subdirectory(swig)
diff --git a/gr-fft/include/fft/CMakeLists.txt b/gr-fft/include/gnuradio/fft/CMakeLists.txt
index bce3da674d..bce3da674d 100644
--- a/gr-fft/include/fft/CMakeLists.txt
+++ b/gr-fft/include/gnuradio/fft/CMakeLists.txt
diff --git a/gr-fft/include/fft/api.h b/gr-fft/include/gnuradio/fft/api.h
index ce2a49f4be..ce2a49f4be 100644
--- a/gr-fft/include/fft/api.h
+++ b/gr-fft/include/gnuradio/fft/api.h
diff --git a/gr-fft/include/fft/fft.h b/gr-fft/include/gnuradio/fft/fft.h
index 9d2467df6f..04673c16e1 100644
--- a/gr-fft/include/fft/fft.h
+++ b/gr-fft/include/gnuradio/fft/fft.h
@@ -27,7 +27,7 @@
* Wrappers for FFTW single precision 1d dft
*/
-#include <fft/api.h>
+#include <gnuradio/fft/api.h>
#include <gnuradio/gr_complex.h>
#include <boost/thread.hpp>
diff --git a/gr-fft/include/fft/fft_vcc.h b/gr-fft/include/gnuradio/fft/fft_vcc.h
index d0a0a53417..a2682de196 100644
--- a/gr-fft/include/fft/fft_vcc.h
+++ b/gr-fft/include/gnuradio/fft/fft_vcc.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_FFT_FFT_VCC_H
#define INCLUDED_FFT_FFT_VCC_H
-#include <fft/api.h>
+#include <gnuradio/fft/api.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-fft/include/fft/fft_vfc.h b/gr-fft/include/gnuradio/fft/fft_vfc.h
index a3f5e133e5..9937d92a34 100644
--- a/gr-fft/include/fft/fft_vfc.h
+++ b/gr-fft/include/gnuradio/fft/fft_vfc.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_FFT_FFT_VFC_H
#define INCLUDED_FFT_FFT_VFC_H
-#include <fft/api.h>
+#include <gnuradio/fft/api.h>
#include <gnuradio/sync_block.h>
namespace gr {
diff --git a/gr-fft/include/fft/goertzel.h b/gr-fft/include/gnuradio/fft/goertzel.h
index 7ec0a3d614..47ff1dd18c 100644
--- a/gr-fft/include/fft/goertzel.h
+++ b/gr-fft/include/gnuradio/fft/goertzel.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_FFT_IMPL_GOERTZEL_H
#define INCLUDED_FFT_IMPL_GOERTZEL_H
-#include <fft/api.h>
+#include <gnuradio/fft/api.h>
#include <gnuradio/types.h>
namespace gr {
diff --git a/gr-fft/include/fft/goertzel_fc.h b/gr-fft/include/gnuradio/fft/goertzel_fc.h
index d22fa98ab3..3815ac0fd4 100644
--- a/gr-fft/include/fft/goertzel_fc.h
+++ b/gr-fft/include/gnuradio/fft/goertzel_fc.h
@@ -23,7 +23,7 @@
#ifndef INCLUDED_FFT_GOERTZEL_FC_H
#define INCLUDED_FFT_GOERTZEL_FC_H
-#include <fft/api.h>
+#include <gnuradio/fft/api.h>
#include <gnuradio/sync_decimator.h>
namespace gr {
diff --git a/gr-fft/lib/fft.cc b/gr-fft/lib/fft.cc
index b3d0f04bc0..abcda7d30e 100644
--- a/gr-fft/lib/fft.cc
+++ b/gr-fft/lib/fft.cc
@@ -20,7 +20,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <fft/fft.h>
+#include <gnuradio/fft/fft.h>
#include <gnuradio/sys_paths.h>
#include <fftw3.h>
diff --git a/gr-fft/lib/fft_vcc_fftw.h b/gr-fft/lib/fft_vcc_fftw.h
index ea15dd07bb..2aa2056f5b 100644
--- a/gr-fft/lib/fft_vcc_fftw.h
+++ b/gr-fft/lib/fft_vcc_fftw.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_FFT_FFT_VCC_FFTW_IMPL_H
#define INCLUDED_FFT_FFT_VCC_FFTW_IMPL_H
-#include <fft/fft_vcc.h>
-#include <fft/fft.h>
+#include <gnuradio/fft/fft_vcc.h>
+#include <gnuradio/fft/fft.h>
namespace gr {
namespace fft {
diff --git a/gr-fft/lib/fft_vfc_fftw.h b/gr-fft/lib/fft_vfc_fftw.h
index 1b6f78ba63..2fe292f8ca 100644
--- a/gr-fft/lib/fft_vfc_fftw.h
+++ b/gr-fft/lib/fft_vfc_fftw.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_FFT_FFT_VFC_FFTW_IMPL_H
#define INCLUDED_FFT_FFT_VFC_FFTW_IMPL_H
-#include <fft/fft_vfc.h>
-#include <fft/fft.h>
+#include <gnuradio/fft/fft_vfc.h>
+#include <gnuradio/fft/fft.h>
namespace gr {
namespace fft {
diff --git a/gr-fft/lib/goertzel.cc b/gr-fft/lib/goertzel.cc
index 4bcd5ee190..ddb086c531 100644
--- a/gr-fft/lib/goertzel.cc
+++ b/gr-fft/lib/goertzel.cc
@@ -25,7 +25,7 @@
#endif
#include <cmath>
-#include <fft/goertzel.h>
+#include <gnuradio/fft/goertzel.h>
namespace gr {
namespace fft {
diff --git a/gr-fft/lib/goertzel_fc_impl.h b/gr-fft/lib/goertzel_fc_impl.h
index 426bc71f6b..79b24f15c4 100644
--- a/gr-fft/lib/goertzel_fc_impl.h
+++ b/gr-fft/lib/goertzel_fc_impl.h
@@ -23,8 +23,8 @@
#ifndef INCLUDED_FFT_GOERTZEL_FC_IMPL_H
#define INCLUDED_FFT_GOERTZEL_FC_IMPL_H
-#include <fft/goertzel_fc.h>
-#include <fft/goertzel.h>
+#include <gnuradio/fft/goertzel_fc.h>
+#include <gnuradio/fft/goertzel.h>
namespace gr {
namespace fft {
diff --git a/gr-fft/swig/CMakeLists.txt b/gr-fft/swig/CMakeLists.txt
index 7c11b85bb4..476e343da7 100644
--- a/gr-fft/swig/CMakeLists.txt
+++ b/gr-fft/swig/CMakeLists.txt
@@ -36,7 +36,7 @@ if(ENABLE_GR_CTRLPORT)
endif(ENABLE_GR_CTRLPORT)
set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/fft_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/fft)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/fft)
set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
set(GR_SWIG_LIBRARIES gnuradio-fft)
diff --git a/gr-fft/swig/fft_swig.i b/gr-fft/swig/fft_swig.i
index 51e44cfe49..005f5ed23a 100644
--- a/gr-fft/swig/fft_swig.i
+++ b/gr-fft/swig/fft_swig.i
@@ -28,14 +28,14 @@
%include "fft_swig_doc.i"
%{
-#include "fft/fft_vcc.h"
-#include "fft/fft_vfc.h"
-#include "fft/goertzel_fc.h"
+#include "gnuradio/fft/fft_vcc.h"
+#include "gnuradio/fft/fft_vfc.h"
+#include "gnuradio/fft/goertzel_fc.h"
%}
-%include "fft/fft_vcc.h"
-%include "fft/fft_vfc.h"
-%include "fft/goertzel_fc.h"
+%include "gnuradio/fft/fft_vcc.h"
+%include "gnuradio/fft/fft_vfc.h"
+%include "gnuradio/fft/goertzel_fc.h"
GR_SWIG_BLOCK_MAGIC2(fft, fft_vcc);
GR_SWIG_BLOCK_MAGIC2(fft, fft_vfc);
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-21 11:57:39 +0000