gsm-receiver: Migrate to more recent gnuradio autotools integration

These changes forward-port gsm-receiver to the gnuradio autotools magic
as per "gr-howto-write-a-block-3.2.2"

It also updates to libosmocore >= 0.3.0 and fixes other minor compilation
issues.

5 files changed, 7 insertions, 8 deletions

diff --git a/gsm-receiver/src/lib/decoder/Makefile.am b/gsm-receiver/src/lib/decoder/Makefile.am
index 9582109..d6b9632 100644
--- a/gsm-receiver/src/lib/decoder/Makefile.am
+++ b/gsm-receiver/src/lib/decoder/Makefile.am
@@ -21,8 +21,6 @@
 
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES)
-
 SUBDIRS = openbtsstuff
 
 noinst_LTLIBRARIES = libdecoder.la
diff --git a/gsm-receiver/src/lib/decoder/a5-1-2.h b/gsm-receiver/src/lib/decoder/a5-1-2.h
index de764ee..38b2d25 100644
--- a/gsm-receiver/src/lib/decoder/a5-1-2.h
+++ b/gsm-receiver/src/lib/decoder/a5-1-2.h
@@ -110,6 +110,8 @@
  *
  */
 
+#ifndef A5_1_2_H
+#define A5_1_2_H
 
 #include <stdio.h>
 
@@ -451,3 +453,4 @@ void test() {
   }
 }
 
+#endif /* A5_1_2_H */
diff --git a/gsm-receiver/src/lib/decoder/gsmstack.c b/gsm-receiver/src/lib/decoder/gsmstack.c
index 3d09c13..73d9028 100644
--- a/gsm-receiver/src/lib/decoder/gsmstack.c
+++ b/gsm-receiver/src/lib/decoder/gsmstack.c
@@ -18,9 +18,9 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <osmocore/msgb.h>
-#include <osmocore/gsmtap.h>
-#include <osmocore/gsmtap_util.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/gsmtap.h>
+#include <osmocom/core/gsmtap_util.h>
 
 static const int USEFUL_BITS = 142;
 
diff --git a/gsm-receiver/src/lib/decoder/openbtsstuff/Makefile.am b/gsm-receiver/src/lib/decoder/openbtsstuff/Makefile.am
index 1b0433c..e71634e 100644
--- a/gsm-receiver/src/lib/decoder/openbtsstuff/Makefile.am
+++ b/gsm-receiver/src/lib/decoder/openbtsstuff/Makefile.am
@@ -21,8 +21,6 @@
 
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES)
-
 noinst_LTLIBRARIES = libopenbtsdecoder.la
 
 libopenbtsdecoder_la_SOURCES = \
diff --git a/gsm-receiver/src/lib/decoder/sch.c b/gsm-receiver/src/lib/decoder/sch.c
index 6f141dd..0eed12d 100644
--- a/gsm-receiver/src/lib/decoder/sch.c
+++ b/gsm-receiver/src/lib/decoder/sch.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
-#include "gsm_constants.h"
+#include "../gsm_constants.h"
 
 /*
  * Synchronization channel.