Changed grgsm install directories and prefixes from "gsm" to "grgsm". The old prefix caused conflicts with libraries already available.

8 files changed, 8 insertions, 9 deletions

diff --git a/lib/misc_utils/bursts_printer_impl.cc b/lib/misc_utils/bursts_printer_impl.cc
index f888a93..8803a84 100644
--- a/lib/misc_utils/bursts_printer_impl.cc
+++ b/lib/misc_utils/bursts_printer_impl.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include <gnuradio/io_signature.h>
-#include <gsm/gsmtap.h>
+#include <grgsm/gsmtap.h>
 #include <iterator>
 #include <algorithm>
 #include "bursts_printer_impl.h"
diff --git a/lib/misc_utils/bursts_printer_impl.h b/lib/misc_utils/bursts_printer_impl.h
index 67f3c25..0ee6923 100644
--- a/lib/misc_utils/bursts_printer_impl.h
+++ b/lib/misc_utils/bursts_printer_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GSM_BURSTS_PRINTER_IMPL_H
 #define INCLUDED_GSM_BURSTS_PRINTER_IMPL_H
 
-#include <gsm/misc_utils/bursts_printer.h>
+#include <grgsm/misc_utils/bursts_printer.h>
 #include <set>
 
 namespace gr {
diff --git a/lib/misc_utils/controlled_const_source_f_impl.h b/lib/misc_utils/controlled_const_source_f_impl.h
index 8fa2f8d..36a6258 100644
--- a/lib/misc_utils/controlled_const_source_f_impl.h
+++ b/lib/misc_utils/controlled_const_source_f_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GSM_CONTROLLED_CONST_SOURCE_F_IMPL_H
 #define INCLUDED_GSM_CONTROLLED_CONST_SOURCE_F_IMPL_H
 
-#include <gsm/misc_utils/controlled_const_source_f.h>
+#include <grgsm/misc_utils/controlled_const_source_f.h>
 
 namespace gr {
   namespace gsm {
diff --git a/lib/misc_utils/controlled_rotator_cc_impl.h b/lib/misc_utils/controlled_rotator_cc_impl.h
index f9a0de7..14064cb 100644
--- a/lib/misc_utils/controlled_rotator_cc_impl.h
+++ b/lib/misc_utils/controlled_rotator_cc_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GSM_CONTROLLED_ROTATOR_CC_IMPL_H
 #define INCLUDED_GSM_CONTROLLED_ROTATOR_CC_IMPL_H
 
-#include <gsm/misc_utils/controlled_rotator_cc.h>
+#include <grgsm/misc_utils/controlled_rotator_cc.h>
 #include <gnuradio/blocks/rotator.h>
 
 namespace gr {
diff --git a/lib/misc_utils/extract_system_info_impl.cc b/lib/misc_utils/extract_system_info_impl.cc
index c4cfa1e..a7ed06d 100644
--- a/lib/misc_utils/extract_system_info_impl.cc
+++ b/lib/misc_utils/extract_system_info_impl.cc
@@ -25,7 +25,7 @@
 #endif
 
 #include <gnuradio/io_signature.h>
-#include <gsm/gsmtap.h>
+#include <grgsm/gsmtap.h>
 #include <unistd.h>
 #include <set>
 #include <iterator>
diff --git a/lib/misc_utils/extract_system_info_impl.h b/lib/misc_utils/extract_system_info_impl.h
index 75d41b3..119303d 100644
--- a/lib/misc_utils/extract_system_info_impl.h
+++ b/lib/misc_utils/extract_system_info_impl.h
@@ -23,8 +23,7 @@
 #ifndef INCLUDED_GSM_EXTRACT_SYSTEM_INFO_IMPL_H
 #define INCLUDED_GSM_EXTRACT_SYSTEM_INFO_IMPL_H
 
-#include <gsm/misc_utils/extract_system_info.h>
-
+#include <grgsm/misc_utils/extract_system_info.h>
 
 
 namespace gr {
diff --git a/lib/misc_utils/message_printer_impl.cc b/lib/misc_utils/message_printer_impl.cc
index 11142aa..48cd95b 100644
--- a/lib/misc_utils/message_printer_impl.cc
+++ b/lib/misc_utils/message_printer_impl.cc
@@ -27,7 +27,7 @@
 #include <gnuradio/io_signature.h>
 #include <stdio.h>
 #include "message_printer_impl.h"
-#include "gsm/gsmtap.h"
+#include "grgsm/gsmtap.h"
 
 namespace gr {
   namespace gsm {
diff --git a/lib/misc_utils/message_printer_impl.h b/lib/misc_utils/message_printer_impl.h
index 897890e..e2c8236 100644
--- a/lib/misc_utils/message_printer_impl.h
+++ b/lib/misc_utils/message_printer_impl.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_GSM_MESSAGE_PRINTER_IMPL_H
 #define INCLUDED_GSM_MESSAGE_PRINTER_IMPL_H
 
-#include <gsm/misc_utils/message_printer.h>
+#include <grgsm/misc_utils/message_printer.h>
 
 namespace gr {
   namespace gsm {