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

3 files changed, 49 insertions, 49 deletions

diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
index 68ffd63..67417dc 100644
--- a/swig/CMakeLists.txt
+++ b/swig/CMakeLists.txt
@@ -36,22 +36,22 @@ foreach(incdir ${GNURADIO_RUNTIME_INCLUDE_DIRS})
 endforeach(incdir)
 
 set(GR_SWIG_LIBRARIES gnuradio-gsm)
-set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/gsm_swig_doc.i)
+set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/grgsm_swig_doc.i)
 set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include)
 
-GR_SWIG_MAKE(gsm_swig gsm_swig.i)
+GR_SWIG_MAKE(grgsm_swig grgsm_swig.i)
 
 ########################################################################
 # Install the build swig module
 ########################################################################
-GR_SWIG_INSTALL(TARGETS gsm_swig DESTINATION ${GR_PYTHON_DIR}/gsm)
+GR_SWIG_INSTALL(TARGETS grgsm_swig DESTINATION ${GR_PYTHON_DIR}/grgsm)
 
 ########################################################################
 # Install swig .i files for development
 ########################################################################
 install(
     FILES
-    gsm_swig.i
-    ${CMAKE_CURRENT_BINARY_DIR}/gsm_swig_doc.i
-    DESTINATION ${GR_INCLUDE_DIR}/gsm/swig
+    grgsm_swig.i
+    ${CMAKE_CURRENT_BINARY_DIR}/grgsm_swig_doc.i
+    DESTINATION ${GR_INCLUDE_DIR}/grgsm/swig
 )
diff --git a/swig/grgsm_swig.i b/swig/grgsm_swig.i
new file mode 100644
index 0000000..d86226c
--- /dev/null
+++ b/swig/grgsm_swig.i
@@ -0,0 +1,43 @@
+/* -*- c++ -*- */
+
+#define GSM_API
+
+%include "gnuradio.i"			// the common stuff
+
+//load generated python docstrings
+%include "grgsm_swig_doc.i"
+
+%{
+#include "grgsm/receiver/receiver.h"
+#include "grgsm/demapping/get_bcch_or_ccch_bursts.h"
+#include "grgsm/demapping/universal_ctrl_chans_demapper.h"
+#include "grgsm/decoding/control_channels_decoder.h"
+#include "grgsm/misc_utils/bursts_printer.h"
+#include "grgsm/misc_utils/controlled_const_source_f.h"
+#include "grgsm/misc_utils/controlled_rotator_cc.h"
+#include "grgsm/misc_utils/extract_system_info.h"
+#include "grgsm/misc_utils/message_printer.h"
+%}
+
+
+%include "grgsm/receiver/receiver.h"
+GR_SWIG_BLOCK_MAGIC2(gsm, receiver);
+
+%include "grgsm/decoding/control_channels_decoder.h"
+GR_SWIG_BLOCK_MAGIC2(gsm, control_channels_decoder);
+
+%include "grgsm/demapping/get_bcch_or_ccch_bursts.h"
+GR_SWIG_BLOCK_MAGIC2(gsm, get_bcch_or_ccch_bursts);
+%include "grgsm/demapping/universal_ctrl_chans_demapper.h"
+GR_SWIG_BLOCK_MAGIC2(gsm, universal_ctrl_chans_demapper);
+
+%include "grgsm/misc_utils/bursts_printer.h"
+GR_SWIG_BLOCK_MAGIC2(gsm, bursts_printer);
+%include "grgsm/misc_utils/extract_system_info.h"
+GR_SWIG_BLOCK_MAGIC2(gsm, extract_system_info);
+%include "grgsm/misc_utils/controlled_rotator_cc.h"
+GR_SWIG_BLOCK_MAGIC2(gsm, controlled_rotator_cc);
+%include "grgsm/misc_utils/controlled_const_source_f.h"
+GR_SWIG_BLOCK_MAGIC2(gsm, controlled_const_source_f);
+%include "grgsm/misc_utils/message_printer.h"
+GR_SWIG_BLOCK_MAGIC2(gsm, message_printer);
diff --git a/swig/gsm_swig.i b/swig/gsm_swig.i
deleted file mode 100644
index 5f3dcb7..0000000
--- a/swig/gsm_swig.i
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- c++ -*- */
-
-#define GSM_API
-
-%include "gnuradio.i"			// the common stuff
-
-//load generated python docstrings
-%include "gsm_swig_doc.i"
-
-%{
-#include "gsm/receiver/receiver.h"
-#include "gsm/demapping/get_bcch_or_ccch_bursts.h"
-#include "gsm/demapping/universal_ctrl_chans_demapper.h"
-#include "gsm/decoding/control_channels_decoder.h"
-#include "gsm/misc_utils/bursts_printer.h"
-#include "gsm/misc_utils/controlled_const_source_f.h"
-#include "gsm/misc_utils/controlled_rotator_cc.h"
-#include "gsm/misc_utils/extract_system_info.h"
-#include "gsm/misc_utils/message_printer.h"
-%}
-
-
-%include "gsm/receiver/receiver.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, receiver);
-
-%include "gsm/decoding/control_channels_decoder.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, control_channels_decoder);
-
-%include "gsm/demapping/get_bcch_or_ccch_bursts.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, get_bcch_or_ccch_bursts);
-%include "gsm/demapping/universal_ctrl_chans_demapper.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, universal_ctrl_chans_demapper);
-
-%include "gsm/misc_utils/bursts_printer.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, bursts_printer);
-%include "gsm/misc_utils/extract_system_info.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, extract_system_info);
-%include "gsm/misc_utils/controlled_rotator_cc.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, controlled_rotator_cc);
-%include "gsm/misc_utils/controlled_const_source_f.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, controlled_const_source_f);
-%include "gsm/misc_utils/message_printer.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, message_printer);