diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-29 22:08:11 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-04-29 22:08:11 -0700 |
commit | aee90f3d490f56d1cb8e47a2254d2873292759d1 (patch) | |
tree | 5d7e7ac49fcc63980ea6cad7ddb05bb8c1b1d0f3 /gr-noaa | |
parent | f821a19326a33cd23d1187784d6a98635d3cfc12 (diff) |
noaa: move include dir to gnuradio/noaa
Diffstat (limited to 'gr-noaa')
-rw-r--r-- | gr-noaa/CMakeLists.txt | 2 | ||||
-rw-r--r-- | gr-noaa/include/gnuradio/noaa/CMakeLists.txt (renamed from gr-noaa/include/noaa/CMakeLists.txt) | 0 | ||||
-rw-r--r-- | gr-noaa/include/gnuradio/noaa/api.h (renamed from gr-noaa/include/noaa/api.h) | 0 | ||||
-rw-r--r-- | gr-noaa/include/gnuradio/noaa/hrpt.h (renamed from gr-noaa/include/noaa/hrpt.h) | 0 | ||||
-rw-r--r-- | gr-noaa/include/gnuradio/noaa/hrpt_decoder.h (renamed from gr-noaa/include/noaa/hrpt_decoder.h) | 2 | ||||
-rw-r--r-- | gr-noaa/include/gnuradio/noaa/hrpt_deframer.h (renamed from gr-noaa/include/noaa/hrpt_deframer.h) | 2 | ||||
-rw-r--r-- | gr-noaa/include/gnuradio/noaa/hrpt_pll_cf.h (renamed from gr-noaa/include/noaa/hrpt_pll_cf.h) | 2 | ||||
-rw-r--r-- | gr-noaa/lib/hrpt_decoder_impl.cc | 2 | ||||
-rw-r--r-- | gr-noaa/lib/hrpt_decoder_impl.h | 2 | ||||
-rw-r--r-- | gr-noaa/lib/hrpt_deframer_impl.cc | 2 | ||||
-rw-r--r-- | gr-noaa/lib/hrpt_deframer_impl.h | 2 | ||||
-rw-r--r-- | gr-noaa/lib/hrpt_pll_cf_impl.h | 2 | ||||
-rw-r--r-- | gr-noaa/swig/CMakeLists.txt | 2 | ||||
-rw-r--r-- | gr-noaa/swig/noaa_swig.i | 12 |
14 files changed, 16 insertions, 16 deletions
diff --git a/gr-noaa/CMakeLists.txt b/gr-noaa/CMakeLists.txt index f13769f95c..966d32c8db 100644 --- a/gr-noaa/CMakeLists.txt +++ b/gr-noaa/CMakeLists.txt @@ -85,7 +85,7 @@ CPACK_COMPONENT("noaa_swig" ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/noaa) +add_subdirectory(include/gnuradio/noaa) add_subdirectory(lib) if(ENABLE_PYTHON) add_subdirectory(swig) diff --git a/gr-noaa/include/noaa/CMakeLists.txt b/gr-noaa/include/gnuradio/noaa/CMakeLists.txt index a3a18d2c26..a3a18d2c26 100644 --- a/gr-noaa/include/noaa/CMakeLists.txt +++ b/gr-noaa/include/gnuradio/noaa/CMakeLists.txt diff --git a/gr-noaa/include/noaa/api.h b/gr-noaa/include/gnuradio/noaa/api.h index d30cbf4746..d30cbf4746 100644 --- a/gr-noaa/include/noaa/api.h +++ b/gr-noaa/include/gnuradio/noaa/api.h diff --git a/gr-noaa/include/noaa/hrpt.h b/gr-noaa/include/gnuradio/noaa/hrpt.h index f0f0e53f4d..f0f0e53f4d 100644 --- a/gr-noaa/include/noaa/hrpt.h +++ b/gr-noaa/include/gnuradio/noaa/hrpt.h diff --git a/gr-noaa/include/noaa/hrpt_decoder.h b/gr-noaa/include/gnuradio/noaa/hrpt_decoder.h index cdb9e4640f..1a8882633e 100644 --- a/gr-noaa/include/noaa/hrpt_decoder.h +++ b/gr-noaa/include/gnuradio/noaa/hrpt_decoder.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_NOAA_HRPT_DECODER_H #define INCLUDED_NOAA_HRPT_DECODER_H -#include <noaa/api.h> +#include <gnuradio/noaa/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-noaa/include/noaa/hrpt_deframer.h b/gr-noaa/include/gnuradio/noaa/hrpt_deframer.h index a8032a7879..cafb2334e8 100644 --- a/gr-noaa/include/noaa/hrpt_deframer.h +++ b/gr-noaa/include/gnuradio/noaa/hrpt_deframer.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_NOAA_HRPT_DEFRAMER_H #define INCLUDED_NOAA_HRPT_DEFRAMER_H -#include <noaa/api.h> +#include <gnuradio/noaa/api.h> #include <gnuradio/block.h> namespace gr { diff --git a/gr-noaa/include/noaa/hrpt_pll_cf.h b/gr-noaa/include/gnuradio/noaa/hrpt_pll_cf.h index 469f426673..d66663da01 100644 --- a/gr-noaa/include/noaa/hrpt_pll_cf.h +++ b/gr-noaa/include/gnuradio/noaa/hrpt_pll_cf.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_NOAA_HRPT_PLL_CF_H #define INCLUDED_NOAA_HRPT_PLL_CF_H -#include <noaa/api.h> +#include <gnuradio/noaa/api.h> #include <gnuradio/sync_block.h> namespace gr { diff --git a/gr-noaa/lib/hrpt_decoder_impl.cc b/gr-noaa/lib/hrpt_decoder_impl.cc index 2f84d464f4..dc7b8f0ec2 100644 --- a/gr-noaa/lib/hrpt_decoder_impl.cc +++ b/gr-noaa/lib/hrpt_decoder_impl.cc @@ -25,7 +25,7 @@ #endif #include "hrpt_decoder_impl.h" -#include <noaa/hrpt.h> +#include <gnuradio/noaa/hrpt.h> #include <gnuradio/io_signature.h> #include <cstdio> diff --git a/gr-noaa/lib/hrpt_decoder_impl.h b/gr-noaa/lib/hrpt_decoder_impl.h index e242c48e0c..9a43c98acd 100644 --- a/gr-noaa/lib/hrpt_decoder_impl.h +++ b/gr-noaa/lib/hrpt_decoder_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_NOAA_HRPT_DECODER_IMPL_H #define INCLUDED_NOAA_HRPT_DECODER_IMPL_H -#include <noaa/hrpt_decoder.h> +#include <gnuradio/noaa/hrpt_decoder.h> namespace gr { namespace noaa { diff --git a/gr-noaa/lib/hrpt_deframer_impl.cc b/gr-noaa/lib/hrpt_deframer_impl.cc index e412a18b9b..65bff09adb 100644 --- a/gr-noaa/lib/hrpt_deframer_impl.cc +++ b/gr-noaa/lib/hrpt_deframer_impl.cc @@ -26,7 +26,7 @@ #include "hrpt_deframer_impl.h" #include <gnuradio/io_signature.h> -#include <noaa/hrpt.h> +#include <gnuradio/noaa/hrpt.h> #include <cstring> #include <cstdio> diff --git a/gr-noaa/lib/hrpt_deframer_impl.h b/gr-noaa/lib/hrpt_deframer_impl.h index 9bad0b87bf..d654f9f606 100644 --- a/gr-noaa/lib/hrpt_deframer_impl.h +++ b/gr-noaa/lib/hrpt_deframer_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_NOAA_HRPT_DEFRAMER_IMPL_H #define INCLUDED_NOAA_HRPT_DEFRAMER_IMPL_H -#include <noaa/hrpt_deframer.h> +#include <gnuradio/noaa/hrpt_deframer.h> namespace gr { namespace noaa { diff --git a/gr-noaa/lib/hrpt_pll_cf_impl.h b/gr-noaa/lib/hrpt_pll_cf_impl.h index cc0c36137e..40b0a21459 100644 --- a/gr-noaa/lib/hrpt_pll_cf_impl.h +++ b/gr-noaa/lib/hrpt_pll_cf_impl.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_NOAA_HRPT_PLL_CF_IMPL_H #define INCLUDED_NOAA_HRPT_PLL_CF_IMPL_H -#include <noaa/hrpt_pll_cf.h> +#include <gnuradio/noaa/hrpt_pll_cf.h> namespace gr { namespace noaa { diff --git a/gr-noaa/swig/CMakeLists.txt b/gr-noaa/swig/CMakeLists.txt index 2bc7c3eb2e..3a6db36103 100644 --- a/gr-noaa/swig/CMakeLists.txt +++ b/gr-noaa/swig/CMakeLists.txt @@ -35,7 +35,7 @@ if(ENABLE_GR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/noaa_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/noaa) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/noaa) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_LIBRARIES gnuradio-noaa) diff --git a/gr-noaa/swig/noaa_swig.i b/gr-noaa/swig/noaa_swig.i index a7d3879369..9fcb83b963 100644 --- a/gr-noaa/swig/noaa_swig.i +++ b/gr-noaa/swig/noaa_swig.i @@ -28,14 +28,14 @@ %include "noaa_swig_doc.i" %{ -#include "noaa/hrpt_decoder.h" -#include "noaa/hrpt_deframer.h" -#include "noaa/hrpt_pll_cf.h" +#include "gnuradio/noaa/hrpt_decoder.h" +#include "gnuradio/noaa/hrpt_deframer.h" +#include "gnuradio/noaa/hrpt_pll_cf.h" %} -%include "noaa/hrpt_decoder.h" -%include "noaa/hrpt_deframer.h" -%include "noaa/hrpt_pll_cf.h" +%include "gnuradio/noaa/hrpt_decoder.h" +%include "gnuradio/noaa/hrpt_deframer.h" +%include "gnuradio/noaa/hrpt_pll_cf.h" GR_SWIG_BLOCK_MAGIC2(noaa, hrpt_decoder); GR_SWIG_BLOCK_MAGIC2(noaa, hrpt_deframer); |