rename includes to match GR naming scheme

CMakeLists.txt

@@ -133,7 +133,7 @@ add_custom_target(uninstall
 ########################################################################
 # Add subdirectories
 ########################################################################
-add_subdirectory(include/ieee802-11)
+add_subdirectory(include/ieee802_11)
 add_subdirectory(lib)
 add_subdirectory(swig)
 add_subdirectory(python)

include/ieee802_11/CMakeLists.txt

@@ -36,6 +36,6 @@ list(APPEND include_sources
 
 install(
     FILES ${include_sources}
-    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/ieee802_11
+    DESTINATION ${GR_INCLUDE_DIR}
     COMPONENT "ieee802_11_devel"
 )

include/ieee802_11/chunks_to_symbols.h

@@ -17,7 +17,7 @@
 #ifndef INCLUDED_IEEE802_11_CHUNKS_TO_SYMBOLS_H
 #define INCLUDED_IEEE802_11_CHUNKS_TO_SYMBOLS_H
 
-#include <ieee802-11/api.h>
+#include <ieee802_11/api.h>
 #include <gnuradio/tagged_stream_block.h>
 
 namespace gr {

include/ieee802_11/constellations.h

@@ -18,7 +18,7 @@
 #ifndef INCLUDED_IEEE802_11_CONSTELLATIONS_H
 #define INCLUDED_IEEE802_11_CONSTELLATIONS_H
 
-#include <ieee802-11/api.h>
+#include <ieee802_11/api.h>
 #include <gnuradio/digital/constellation.h>
 
 namespace gr {

include/ieee802_11/decode_mac.h

@@ -17,7 +17,7 @@
 #ifndef INCLUDED_IEEE802_11_DECODE_MAC_H
 #define INCLUDED_IEEE802_11_DECODE_MAC_H
 
-#include <ieee802-11/api.h>
+#include <ieee802_11/api.h>
 #include <gnuradio/block.h>
 
 namespace gr {

include/ieee802_11/ether_encap.h

@@ -17,7 +17,7 @@
 #ifndef INCLUDED_IEEE802_11_ETHER_ENCAP_H
 #define INCLUDED_IEEE802_11_ETHER_ENCAP_H
 
-#include <ieee802-11/api.h>
+#include <ieee802_11/api.h>
 #include <gnuradio/block.h>
 
 namespace gr {

include/ieee802_11/frame_equalizer.h

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_IEEE802_11_FRAME_EQUALIZER_H
 #define INCLUDED_IEEE802_11_FRAME_EQUALIZER_H
 
-#include <ieee802-11/api.h>
+#include <ieee802_11/api.h>
 #include <gnuradio/block.h>
 
 enum Equalizer {

include/ieee802_11/mac.h

@@ -17,7 +17,7 @@
 #ifndef INCLUDED_IEEE802_11_MAC_H
 #define INCLUDED_IEEE802_11_MAC_H
 
-#include <ieee802-11/api.h>
+#include <ieee802_11/api.h>
 #include <gnuradio/block.h>
 
 namespace gr {

include/ieee802_11/mapper.h

@@ -17,7 +17,7 @@
 #ifndef INCLUDED_IEEE802_11_MAPPER_H
 #define INCLUDED_IEEE802_11_MAPPER_H
 
-#include <ieee802-11/api.h>
+#include <ieee802_11/api.h>
 #include <gnuradio/block.h>
 
 enum Encoding {

include/ieee802_11/moving_average_XX.h.t

@@ -17,7 +17,7 @@
 #ifndef @GUARD_NAME@
 #define @GUARD_NAME@
 
-#include <ieee802-11/api.h>
+#include <ieee802_11/api.h>
 #include <gnuradio/sync_block.h>
 
 namespace gr {

include/ieee802_11/parse_mac.h

@@ -17,7 +17,7 @@
 #ifndef INCLUDED_IEEE802_11_PARSE_MAC_H
 #define INCLUDED_IEEE802_11_PARSE_MAC_H
 
-#include <ieee802-11/api.h>
+#include <ieee802_11/api.h>
 #include <gnuradio/block.h>
 
 namespace gr {

include/ieee802_11/signal_field.h

@@ -18,7 +18,7 @@
 #ifndef INCLUDED_IEEE802_11_SIGNAL_FIELD_H
 #define INCLUDED_IEEE802_11_SIGNAL_FIELD_H
 
-#include <ieee802-11/api.h>
+#include <ieee802_11/api.h>
 #include <gnuradio/digital/packet_header_default.h>
 
 namespace gr {

include/ieee802_11/sync_long.h

@@ -17,7 +17,7 @@
 #ifndef INCLUDED_IEEE802_11_SYNC_LONG_H
 #define INCLUDED_IEEE802_11_SYNC_LONG_H
 
-#include <ieee802-11/api.h>
+#include <ieee802_11/api.h>
 #include <gnuradio/block.h>
 
 namespace gr {

include/ieee802_11/sync_short.h

@@ -17,7 +17,7 @@
 #ifndef INCLUDED_IEEE802_11_SYNC_SHORT_H
 #define INCLUDED_IEEE802_11_SYNC_SHORT_H
 
-#include <ieee802-11/api.h>
+#include <ieee802_11/api.h>
 #include <gnuradio/block.h>
 
 namespace gr {

lib/chunks_to_symbols_impl.h

@@ -17,8 +17,8 @@
 #ifndef INCLUDED_IEEE802_11_CHUNKS_TO_SYMBOLS_IMPL_H
 #define INCLUDED_IEEE802_11_CHUNKS_TO_SYMBOLS_IMPL_H
 
-#include <ieee802-11/chunks_to_symbols.h>
+#include <ieee802_11/chunks_to_symbols.h>
-#include <ieee802-11/constellations.h>
+#include <ieee802_11/constellations.h>
 
 namespace gr {
 namespace ieee802_11 {

lib/constellations_impl.h

@@ -17,7 +17,7 @@
 #ifndef INCLUDED_IEEE802_11_CONSTELLATIONS_IMPL_H
 #define INCLUDED_IEEE802_11_CONSTELLATIONS_IMPL_H
 
-#include <ieee802-11/constellations.h>
+#include <ieee802_11/constellations.h>
 
 namespace gr {
 namespace ieee802_11 {

lib/decode_mac.cc

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <ieee802-11/decode_mac.h>
+#include <ieee802_11/decode_mac.h>
 
 #include "utils.h"
 #include "viterbi_decoder/viterbi_decoder.h"

lib/ether_encap_impl.h

@@ -17,7 +17,7 @@
 #ifndef INCLUDED_IEEE802_11_ETHER_ENCAP_IMPL_H
 #define INCLUDED_IEEE802_11_ETHER_ENCAP_IMPL_H
 
-#include <ieee802-11/ether_encap.h>
+#include <ieee802_11/ether_encap.h>
 
 namespace gr {
 namespace ieee802_11 {

lib/frame_equalizer_impl.h

@@ -18,8 +18,8 @@
 #ifndef INCLUDED_IEEE802_11_FRAME_EQUALIZER_IMPL_H
 #define INCLUDED_IEEE802_11_FRAME_EQUALIZER_IMPL_H
 
-#include <ieee802-11/frame_equalizer.h>
+#include <ieee802_11/frame_equalizer.h>
-#include <ieee802-11/constellations.h>
+#include <ieee802_11/constellations.h>
 #include "equalizer/base.h"
 #include "viterbi_decoder/viterbi_decoder.h"
 

lib/mac.cc

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <ieee802-11/mac.h>
+#include <ieee802_11/mac.h>
 
 #include <gnuradio/io_signature.h>
 #include <gnuradio/block_detail.h>

lib/mapper.cc

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <ieee802-11/mapper.h>
+#include <ieee802_11/mapper.h>
 #include "utils.h"
 #include <gnuradio/io_signature.h>
 

lib/parse_mac.cc

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <ieee802-11/parse_mac.h>
+#include <ieee802_11/parse_mac.h>
 #include "utils.h"
 
 #include <gnuradio/io_signature.h>

lib/signal_field_impl.h

@@ -18,7 +18,7 @@
 #ifndef INCLUDED_IEEE802_11_SIGNAL_FIELD_IMPL_H
 #define INCLUDED_IEEE802_11_SIGNAL_FIELD_IMPL_H
 
-#include <ieee802-11/signal_field.h>
+#include <ieee802_11/signal_field.h>
 #include "utils.h"
 
 namespace gr {

lib/sync_long.cc

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <ieee802-11/sync_long.h>
+#include <ieee802_11/sync_long.h>
 #include "utils.h"
 #include <gnuradio/io_signature.h>
 #include <gnuradio/filter/fir_filter.h>

lib/sync_short.cc

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <ieee802-11/sync_short.h>
+#include <ieee802_11/sync_short.h>
 #include <gnuradio/io_signature.h>
 #include "utils.h"
 

lib/utils.h

@@ -17,8 +17,8 @@
 #ifndef INCLUDED_IEEE802_11_UTILS_H
 #define INCLUDED_IEEE802_11_UTILS_H
 
-#include <ieee802-11/api.h>
+#include <ieee802_11/api.h>
-#include <ieee802-11/mapper.h>
+#include <ieee802_11/mapper.h>
 #include <gnuradio/config.h>
 #include <cinttypes>
 #include <iostream>

swig/ieee802_11_swig.i

@@ -24,17 +24,17 @@
 %include "ieee802_11_swig_doc.i"
 
 %{
-#include "ieee802-11/chunks_to_symbols.h"
+#include "ieee802_11/chunks_to_symbols.h"
-#include "ieee802-11/constellations.h"
+#include "ieee802_11/constellations.h"
-#include "ieee802-11/decode_mac.h"
+#include "ieee802_11/decode_mac.h"
-#include "ieee802-11/ether_encap.h"
+#include "ieee802_11/ether_encap.h"
-#include "ieee802-11/frame_equalizer.h"
+#include "ieee802_11/frame_equalizer.h"
-#include "ieee802-11/mac.h"
+#include "ieee802_11/mac.h"
-#include "ieee802-11/mapper.h"
+#include "ieee802_11/mapper.h"
-#include "ieee802-11/parse_mac.h"
+#include "ieee802_11/parse_mac.h"
-#include "ieee802-11/signal_field.h"
+#include "ieee802_11/signal_field.h"
-#include "ieee802-11/sync_long.h"
+#include "ieee802_11/sync_long.h"
-#include "ieee802-11/sync_short.h"
+#include "ieee802_11/sync_short.h"
 %}
 
 %include "gnuradio/digital/packet_header_default.h"
@@ -44,17 +44,17 @@
 %ignore gr::digital::constellation_16qam;
 %include "gnuradio/digital/constellation.h"
 
-%include "ieee802-11/chunks_to_symbols.h"
+%include "ieee802_11/chunks_to_symbols.h"
-%include "ieee802-11/constellations.h"
+%include "ieee802_11/constellations.h"
-%include "ieee802-11/decode_mac.h"
+%include "ieee802_11/decode_mac.h"
-%include "ieee802-11/ether_encap.h"
+%include "ieee802_11/ether_encap.h"
-%include "ieee802-11/frame_equalizer.h"
+%include "ieee802_11/frame_equalizer.h"
-%include "ieee802-11/mac.h"
+%include "ieee802_11/mac.h"
-%include "ieee802-11/mapper.h"
+%include "ieee802_11/mapper.h"
-%include "ieee802-11/parse_mac.h"
+%include "ieee802_11/parse_mac.h"
-%include "ieee802-11/signal_field.h"
+%include "ieee802_11/signal_field.h"
-%include "ieee802-11/sync_long.h"
+%include "ieee802_11/sync_long.h"
-%include "ieee802-11/sync_short.h"
+%include "ieee802_11/sync_short.h"
 
 GR_SWIG_BLOCK_MAGIC2(ieee802_11, chunks_to_symbols);
 GR_SWIG_BLOCK_MAGIC2(ieee802_11, decode_mac);