aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Munaut <tnt@246tNt.com>2015-04-05 11:30:20 +0200
committerSylvain Munaut <tnt@246tNt.com>2015-04-05 11:30:20 +0200
commit42c03de385e4eeb94fe852a1ab2fc00ac6f38366 (patch)
tree0dbbb68decaec9d40c12ced6b30354f56ccee16c
parente9e2ee173ed535d00d5a6537a0bf0a19408287a7 (diff)
rtfwk: Create a new rxfwk subdir to contain the 'RealTime framework' files
So that other apps can re-use it. Note that it's not part of the gmr1 lib proper and so include files are in that dir and not installed. Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am5
-rw-r--r--src/gmr1_rx_live.c4
-rw-r--r--src/rtfwk/Makefile.am8
-rw-r--r--src/rtfwk/ringbuf.c (renamed from src/ringbuf.c)0
-rw-r--r--src/rtfwk/ringbuf.h (renamed from src/ringbuf.h)0
-rw-r--r--src/rtfwk/sa_file.c (renamed from src/sa_file.c)0
-rw-r--r--src/rtfwk/sa_file.h (renamed from src/sa_file.h)0
-rw-r--r--src/rtfwk/sampbuf.c (renamed from src/sampbuf.c)0
-rw-r--r--src/rtfwk/sampbuf.h (renamed from src/sampbuf.h)0
10 files changed, 14 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 5fc0560..1211ca5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,6 +51,7 @@ AC_OUTPUT(
src/Makefile
src/codec/Makefile
src/l1/Makefile
+ src/rtfwk/Makefile
src/sdr/Makefile
Makefile
Doxyfile
diff --git a/src/Makefile.am b/src/Makefile.am
index 601ea86..844bc46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = codec l1 sdr
+SUBDIRS = codec l1 rtfwk sdr
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMODSP_CFLAGS)
@@ -10,9 +10,10 @@ gmr1_rx_LDADD = $(top_builddir)/src/l1/libgmr1-l1.a \
$(top_builddir)/src/sdr/libgmr1-sdr.a \
$(LIBOSMOCORE_LIBS) $(LIBOSMODSP_LIBS) $(FFTW3F_LIBS)
-gmr1_rx_live_SOURCES = gmr1_rx_live.c gsmtap.c ringbuf.c sa_file.c sampbuf.c
+gmr1_rx_live_SOURCES = gmr1_rx_live.c gsmtap.c
gmr1_rx_live_LDADD = $(top_builddir)/src/l1/libgmr1-l1.a \
$(top_builddir)/src/sdr/libgmr1-sdr.a \
+ $(top_builddir)/src/rtfwk/libgmr1-rtfwk.a \
$(LIBOSMOCORE_LIBS) $(LIBOSMODSP_LIBS) $(FFTW3F_LIBS)
gmr1_rach_gen_SOURCES = gmr1_rach_gen.c
diff --git a/src/gmr1_rx_live.c b/src/gmr1_rx_live.c
index b3254d9..1c66288 100644
--- a/src/gmr1_rx_live.c
+++ b/src/gmr1_rx_live.c
@@ -44,8 +44,8 @@
#include <osmocom/gmr1/sdr/pi4cxpsk.h>
#include <osmocom/gmr1/sdr/nb.h>
-#include "sampbuf.h"
-#include "sa_file.h"
+#include "rtfwk/sampbuf.h"
+#include "rtfwk/sa_file.h"
struct app_state
diff --git a/src/rtfwk/Makefile.am b/src/rtfwk/Makefile.am
new file mode 100644
index 0000000..cba617c
--- /dev/null
+++ b/src/rtfwk/Makefile.am
@@ -0,0 +1,8 @@
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
+AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMODSP_CFLAGS)
+AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMODSP_LIBS) $(FFTW3F_LIBS)
+
+noinst_LIBRARIES = libgmr1-rtfwk.a
+
+libgmr1_rtfwk_a_SOURCES = \
+ ringbuf.c sa_file.c sampbuf.c
diff --git a/src/ringbuf.c b/src/rtfwk/ringbuf.c
index 64604fb..64604fb 100644
--- a/src/ringbuf.c
+++ b/src/rtfwk/ringbuf.c
diff --git a/src/ringbuf.h b/src/rtfwk/ringbuf.h
index bd7060a..bd7060a 100644
--- a/src/ringbuf.h
+++ b/src/rtfwk/ringbuf.h
diff --git a/src/sa_file.c b/src/rtfwk/sa_file.c
index 37e910e..37e910e 100644
--- a/src/sa_file.c
+++ b/src/rtfwk/sa_file.c
diff --git a/src/sa_file.h b/src/rtfwk/sa_file.h
index e65301a..e65301a 100644
--- a/src/sa_file.h
+++ b/src/rtfwk/sa_file.h
diff --git a/src/sampbuf.c b/src/rtfwk/sampbuf.c
index 93db857..93db857 100644
--- a/src/sampbuf.c
+++ b/src/rtfwk/sampbuf.c
diff --git a/src/sampbuf.h b/src/rtfwk/sampbuf.h
index d7fe23b..d7fe23b 100644
--- a/src/sampbuf.h
+++ b/src/rtfwk/sampbuf.h