diff options
| author | Sylvain Munaut <tnt@246tNt.com> | 2015-02-08 17:05:20 +0100 |
|---|---|---|
| committer | Sylvain Munaut <tnt@246tNt.com> | 2015-04-04 13:55:45 +0200 |
| commit | c9bebd030983a97145b1e4781ceae1b1061ee3e2 (patch) | |
| tree | 2bb3b3792edcf833f414e93b2dd2be1ccb5ccede | |
| parent | a8733e64e82a6171d14197df2231270f87d4ee95 (diff) | |
rxfwk: Create a new rxfwk subdir to contain the 'RX 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.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/gmr1_rx_live.c | 4 | ||||
| -rw-r--r-- | src/rxfwk/Makefile.am | 8 | ||||
| -rw-r--r-- | src/rxfwk/ringbuf.c (renamed from src/ringbuf.c) | 0 | ||||
| -rw-r--r-- | src/rxfwk/ringbuf.h (renamed from src/ringbuf.h) | 0 | ||||
| -rw-r--r-- | src/rxfwk/sa_file.c (renamed from src/sa_file.c) | 0 | ||||
| -rw-r--r-- | src/rxfwk/sa_file.h (renamed from src/sa_file.h) | 0 | ||||
| -rw-r--r-- | src/rxfwk/sampbuf.c (renamed from src/sampbuf.c) | 0 | ||||
| -rw-r--r-- | src/rxfwk/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..ce4a25c 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,7 @@ AC_OUTPUT( src/Makefile src/codec/Makefile src/l1/Makefile + src/rxfwk/Makefile src/sdr/Makefile Makefile Doxyfile diff --git a/src/Makefile.am b/src/Makefile.am index 601ea86..ceebd9b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = codec l1 sdr +SUBDIRS = codec l1 rxfwk 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/rxfwk/libgmr1-rxfwk.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..c36c220 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 "rxfwk/sampbuf.h" +#include "rxfwk/sa_file.h" struct app_state diff --git a/src/rxfwk/Makefile.am b/src/rxfwk/Makefile.am new file mode 100644 index 0000000..49e51ff --- /dev/null +++ b/src/rxfwk/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-rxfwk.a + +libgmr1_rxfwk_a_SOURCES = \ + ringbuf.c sa_file.c sampbuf.c diff --git a/src/ringbuf.c b/src/rxfwk/ringbuf.c index 64604fb..64604fb 100644 --- a/src/ringbuf.c +++ b/src/rxfwk/ringbuf.c diff --git a/src/ringbuf.h b/src/rxfwk/ringbuf.h index bd7060a..bd7060a 100644 --- a/src/ringbuf.h +++ b/src/rxfwk/ringbuf.h diff --git a/src/sa_file.c b/src/rxfwk/sa_file.c index 37e910e..37e910e 100644 --- a/src/sa_file.c +++ b/src/rxfwk/sa_file.c diff --git a/src/sa_file.h b/src/rxfwk/sa_file.h index e65301a..e65301a 100644 --- a/src/sa_file.h +++ b/src/rxfwk/sa_file.h diff --git a/src/sampbuf.c b/src/rxfwk/sampbuf.c index 856f109..856f109 100644 --- a/src/sampbuf.c +++ b/src/rxfwk/sampbuf.c diff --git a/src/sampbuf.h b/src/rxfwk/sampbuf.h index d7fe23b..d7fe23b 100644 --- a/src/sampbuf.h +++ b/src/rxfwk/sampbuf.h |