aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2017-11-16 19:18:42 +0100
committerAndreas Eversberg <jolly@eversberg.eu>2017-11-25 19:24:02 +0100
commitf4754dcb37fa08775ca7e4af4f1bb4ea294fabcc (patch)
tree2f7cac0f8356dd3cbfd3376b9e00a9e081ce73c2
parent7af9b752a03675ee1f219c0bf14162c5c628870b (diff)
Restructure: Move fm_modulation from common code to 'libfm'
-rw-r--r--.gitignore1
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am2
-rw-r--r--src/amps/Makefile.am1
-rw-r--r--src/anetz/Makefile.am1
-rw-r--r--src/bnetz/Makefile.am1
-rw-r--r--src/cnetz/Makefile.am1
-rw-r--r--src/common/Makefile.am1
-rw-r--r--src/common/fsk.h2
-rw-r--r--src/common/sdr.c2
-rw-r--r--src/jtacs/Makefile.am1
-rw-r--r--src/libfm/Makefile.am6
-rw-r--r--src/libfm/fm.c (renamed from src/common/fm_modulation.c)4
-rw-r--r--src/libfm/fm.h (renamed from src/common/fm_modulation.h)0
-rw-r--r--src/nmt/Makefile.am1
-rw-r--r--src/r2000/Makefile.am1
-rw-r--r--src/tacs/Makefile.am1
-rw-r--r--src/test/Makefile.am5
-rw-r--r--src/test/test_performance.c2
-rw-r--r--src/tv/Makefile.am1
-rw-r--r--src/tv/main.c2
21 files changed, 29 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 94039ad..6846aab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,7 @@ src/libtimer/libtimer.a
src/libsamplerate/libsamplerate.a
src/libscrambler/libscrambler.a
src/libemphasis/libemphasis.a
+src/libfm/libfm.a
src/libfilter/libfilter.a
src/libwave/libwave.a
src/libfft/libfft.a
diff --git a/configure.ac b/configure.ac
index 82f5eae..db9c196 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,6 +84,7 @@ AC_OUTPUT(
src/libsamplerate/Makefile
src/libscrambler/Makefile
src/libemphasis/Makefile
+ src/libfm/Makefile
src/libfilter/Makefile
src/libwave/Makefile
src/libfft/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 5edcabe..f00125f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = libgoertzel libjitter libsquelch libhagelbarger libdtmf libtimer libsamplerate libscrambler libemphasis libfilter libwave libfft common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
+SUBDIRS = libgoertzel libjitter libsquelch libhagelbarger libdtmf libtimer libsamplerate libscrambler libemphasis libfm libfilter libwave libfft common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
diff --git a/src/amps/Makefile.am b/src/amps/Makefile.am
index 3e96124..3990e9a 100644
--- a/src/amps/Makefile.am
+++ b/src/amps/Makefile.am
@@ -33,6 +33,7 @@ amps_LDADD = \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
+ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
diff --git a/src/anetz/Makefile.am b/src/anetz/Makefile.am
index 6864631..29b7f36 100644
--- a/src/anetz/Makefile.am
+++ b/src/anetz/Makefile.am
@@ -26,6 +26,7 @@ anetz_LDADD = \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
+ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am
index 009ec07..55a7b36 100644
--- a/src/bnetz/Makefile.am
+++ b/src/bnetz/Makefile.am
@@ -21,6 +21,7 @@ bnetz_LDADD = \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
+ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
diff --git a/src/cnetz/Makefile.am b/src/cnetz/Makefile.am
index e4df7ef..8962b94 100644
--- a/src/cnetz/Makefile.am
+++ b/src/cnetz/Makefile.am
@@ -24,6 +24,7 @@ cnetz_LDADD = \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libscrambler/libscrambler.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
+ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 52ee381..9e9908a 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -7,7 +7,6 @@ libcommon_a_SOURCES = \
debug.c \
sound_alsa.c \
compandor.c \
- fm_modulation.c \
fsk.c \
display_wave.c \
display_measurements.c
diff --git a/src/common/fsk.h b/src/common/fsk.h
index 723fe66..a7cc428 100644
--- a/src/common/fsk.h
+++ b/src/common/fsk.h
@@ -1,4 +1,4 @@
-#include "../common/fm_modulation.h"
+#include "../libfm/fm.h"
typedef struct ffsk {
void *inst;
diff --git a/src/common/sdr.c b/src/common/sdr.c
index 01048ee..d7a445b 100644
--- a/src/common/sdr.c
+++ b/src/common/sdr.c
@@ -30,7 +30,7 @@ enum paging_signal;
#include <pthread.h>
#include <unistd.h>
#include "sample.h"
-#include "fm_modulation.h"
+#include "../libfm/fm.h"
#include "../libtimer/timer.h"
#include "sender.h"
#include "sdr_config.h"
diff --git a/src/jtacs/Makefile.am b/src/jtacs/Makefile.am
index 3c01af1..15a657b 100644
--- a/src/jtacs/Makefile.am
+++ b/src/jtacs/Makefile.am
@@ -19,6 +19,7 @@ jtacs_LDADD = \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
+ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
diff --git a/src/libfm/Makefile.am b/src/libfm/Makefile.am
new file mode 100644
index 0000000..d78a28e
--- /dev/null
+++ b/src/libfm/Makefile.am
@@ -0,0 +1,6 @@
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+
+noinst_LIBRARIES = libfm.a
+
+libfm_a_SOURCES = \
+ fm.c
diff --git a/src/common/fm_modulation.c b/src/libfm/fm.c
index 93621c8..0e47d8a 100644
--- a/src/common/fm_modulation.c
+++ b/src/libfm/fm.c
@@ -23,8 +23,8 @@
#include <string.h>
#include <errno.h>
#include <math.h>
-#include "sample.h"
-#include "fm_modulation.h"
+#include "../common/sample.h"
+#include "fm.h"
//#define FAST_SINE
diff --git a/src/common/fm_modulation.h b/src/libfm/fm.h
index 68f0bcd..68f0bcd 100644
--- a/src/common/fm_modulation.h
+++ b/src/libfm/fm.h
diff --git a/src/nmt/Makefile.am b/src/nmt/Makefile.am
index a32875a..d36c727 100644
--- a/src/nmt/Makefile.am
+++ b/src/nmt/Makefile.am
@@ -31,6 +31,7 @@ nmt_LDADD = \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
+ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
diff --git a/src/r2000/Makefile.am b/src/r2000/Makefile.am
index e6d9bc4..d122532 100644
--- a/src/r2000/Makefile.am
+++ b/src/r2000/Makefile.am
@@ -19,6 +19,7 @@ radiocom2000_LDADD = \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
+ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
diff --git a/src/tacs/Makefile.am b/src/tacs/Makefile.am
index d0ae341..7f3afbf 100644
--- a/src/tacs/Makefile.am
+++ b/src/tacs/Makefile.am
@@ -20,6 +20,7 @@ tacs_LDADD = \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
+ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index 62ca801..24666bb 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -19,6 +19,7 @@ test_filter_LDADD = \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
+ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
@@ -48,6 +49,7 @@ test_emphasis_LDADD = \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
+ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
@@ -67,6 +69,7 @@ test_dms_LDADD = \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
+ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
@@ -86,6 +89,7 @@ test_sms_LDADD = \
$(top_builddir)/src/libtimer/libtimer.a \
$(top_builddir)/src/libsamplerate/libsamplerate.a \
$(top_builddir)/src/libemphasis/libemphasis.a \
+ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
@@ -100,6 +104,7 @@ test_performance_LDADD = \
$(COMMON_LA) \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
+ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(ALSA_LIBS) \
$(UHD_LIBS) \
diff --git a/src/test/test_performance.c b/src/test/test_performance.c
index 175185c..100c050 100644
--- a/src/test/test_performance.c
+++ b/src/test/test_performance.c
@@ -5,7 +5,7 @@
#include <sys/time.h>
#include "../common/sample.h"
#include "../libfilter/iir_filter.h"
-#include "../common/fm_modulation.h"
+#include "../libfm/fm.h"
#include "../common/debug.h"
struct timeval start_tv, tv;
diff --git a/src/tv/Makefile.am b/src/tv/Makefile.am
index 3277ed4..e0e2cf2 100644
--- a/src/tv/Makefile.am
+++ b/src/tv/Makefile.am
@@ -17,6 +17,7 @@ osmotv_LDADD = \
$(top_builddir)/src/common/libimage.a \
$(top_builddir)/src/common/libcommon.a \
$(top_builddir)/src/libtimer/libtimer.a \
+ $(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
$(top_builddir)/src/libfft/libfft.a \
diff --git a/src/tv/main.c b/src/tv/main.c
index 7440d0b..e997156 100644
--- a/src/tv/main.c
+++ b/src/tv/main.c
@@ -29,7 +29,7 @@ enum paging_signal;
#include <math.h>
#include "../common/sample.h"
#include "../libfilter/iir_filter.h"
-#include "../common/fm_modulation.h"
+#include "../libfm/fm.h"
#include "../libwave/wave.h"
#include "../common/img.h"
#include "../common/debug.h"