From f9834dcc4f3ec00f4a1922b6978216f9af7e54a7 Mon Sep 17 00:00:00 2001
From: ptrkrysik <ptrkrysik@gmail.com>
Date: Wed, 10 Sep 2014 06:35:02 +0200
Subject: Correction of swig configuration - the receiver now compiles and
 works

---
 swig/CMakeLists.txt |  8 --------
 swig/gsm_swig.i     | 42 ++++++++++++++++++++++--------------------
 2 files changed, 22 insertions(+), 28 deletions(-)

(limited to 'swig')

diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
index 7c88fa2..68ffd63 100644
--- a/swig/CMakeLists.txt
+++ b/swig/CMakeLists.txt
@@ -17,14 +17,6 @@
 # the Free Software Foundation, Inc., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
 
-########################################################################
-# Check if there is C++ code at all
-########################################################################
-if(NOT lol_sources)
-	MESSAGE(STATUS "No C++ sources... skipping swig/")
-	return()
-endif(NOT lol_sources)
-
 ########################################################################
 # Include swig generation macros
 ########################################################################
diff --git a/swig/gsm_swig.i b/swig/gsm_swig.i
index 3305e1b..939c7f2 100644
--- a/swig/gsm_swig.i
+++ b/swig/gsm_swig.i
@@ -8,34 +8,36 @@
 %include "gsm_swig_doc.i"
 
 %{
-#include "gsm/receiver.h"
-#include "gsm/bursts_printer.h"
-#include "gsm/get_bcch_or_ccch_bursts.h"
-#include "gsm/control_channels_decoder.h"
-#include "gsm/extract_system_info.h"
-#include "gsm/controlled_rotator_cc.h"
-#include "gsm/controlled_const_source_f.h"
-#include "gsm/message_printer.h"
-#include "gsm/wireshark_sink.h"
+#include "gsm/receiver/receiver.h"
+#include "gsm/demapping/get_bcch_or_ccch_bursts.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/misc_utils/wireshark_sink.h"
 %}
 
 
-%include "gsm/receiver.h"
+%include "gsm/receiver/receiver.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, receiver);
-%include "gsm/bursts_printer.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, bursts_printer);
 
-%include "gsm/get_bcch_or_ccch_bursts.h"
-GR_SWIG_BLOCK_MAGIC2(gsm, get_bcch_or_ccch_bursts);
-%include "gsm/control_channels_decoder.h"
+%include "gsm/decoding/control_channels_decoder.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, control_channels_decoder);
-%include "gsm/extract_system_info.h"
+
+%include "gsm/demapping/get_bcch_or_ccch_bursts.h"
+GR_SWIG_BLOCK_MAGIC2(gsm, get_bcch_or_ccch_bursts);
+
+%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/controlled_rotator_cc.h"
+%include "gsm/misc_utils/controlled_rotator_cc.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, controlled_rotator_cc);
-%include "gsm/controlled_const_source_f.h"
+%include "gsm/misc_utils/controlled_const_source_f.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, controlled_const_source_f);
-%include "gsm/message_printer.h"
+%include "gsm/misc_utils/message_printer.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, message_printer);
-%include "gsm/wireshark_sink.h"
+%include "gsm/misc_utils/wireshark_sink.h"
 GR_SWIG_BLOCK_MAGIC2(gsm, wireshark_sink);
-- 
cgit v1.2.3