aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Eversberg <jolly@eversberg.eu>2017-11-16 21:04:23 +0100
committerAndreas Eversberg <jolly@eversberg.eu>2017-11-25 19:24:03 +0100
commit083ea4edaab0ea5b0c9c2aedd1483be4ec97bc5b (patch)
tree159a1584b1ef66b170d73405a4afac11a0bffc8e
parentf4754dcb37fa08775ca7e4af4f1bb4ea294fabcc (diff)
Restructure: Move fsk from common code to 'libfsk'
-rw-r--r--.gitignore1
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am2
-rw-r--r--src/bnetz/Makefile.am1
-rw-r--r--src/bnetz/bnetz.h2
-rw-r--r--src/common/Makefile.am1
-rw-r--r--src/libfsk/Makefile.am6
-rw-r--r--src/libfsk/fsk.c (renamed from src/common/fsk.c)0
-rw-r--r--src/libfsk/fsk.h (renamed from src/common/fsk.h)0
-rw-r--r--src/nmt/Makefile.am1
-rw-r--r--src/nmt/nmt.h2
-rw-r--r--src/r2000/Makefile.am1
-rw-r--r--src/r2000/r2000.h2
13 files changed, 15 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 6846aab..5ebf7c6 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/libfsk/libfsk.a
src/libfm/libfm.a
src/libfilter/libfilter.a
src/libwave/libwave.a
diff --git a/configure.ac b/configure.ac
index db9c196..9d57e85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,6 +84,7 @@ AC_OUTPUT(
src/libsamplerate/Makefile
src/libscrambler/Makefile
src/libemphasis/Makefile
+ src/libfsk/Makefile
src/libfm/Makefile
src/libfilter/Makefile
src/libwave/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index f00125f..e9cde59 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 libfm libfilter libwave libfft common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
+SUBDIRS = libgoertzel libjitter libsquelch libhagelbarger libdtmf libtimer libsamplerate libscrambler libemphasis libfsk libfm libfilter libwave libfft common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am
index 55a7b36..663517b 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/libfsk/libfsk.a \
$(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
diff --git a/src/bnetz/bnetz.h b/src/bnetz/bnetz.h
index a84bc8c..631fb27 100644
--- a/src/bnetz/bnetz.h
+++ b/src/bnetz/bnetz.h
@@ -1,5 +1,5 @@
#include "../libsquelch/squelch.h"
-#include "../common/fsk.h"
+#include "../libfsk/fsk.h"
#include "../common/sender.h"
#include "../libtimer/timer.h"
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 9e9908a..adabe55 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 \
- fsk.c \
display_wave.c \
display_measurements.c
diff --git a/src/libfsk/Makefile.am b/src/libfsk/Makefile.am
new file mode 100644
index 0000000..53f5563
--- /dev/null
+++ b/src/libfsk/Makefile.am
@@ -0,0 +1,6 @@
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+
+noinst_LIBRARIES = libfsk.a
+
+libfsk_a_SOURCES = \
+ fsk.c
diff --git a/src/common/fsk.c b/src/libfsk/fsk.c
index fecd3bf..fecd3bf 100644
--- a/src/common/fsk.c
+++ b/src/libfsk/fsk.c
diff --git a/src/common/fsk.h b/src/libfsk/fsk.h
index a7cc428..a7cc428 100644
--- a/src/common/fsk.h
+++ b/src/libfsk/fsk.h
diff --git a/src/nmt/Makefile.am b/src/nmt/Makefile.am
index d36c727..545cb27 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/libfsk/libfsk.a \
$(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
diff --git a/src/nmt/nmt.h b/src/nmt/nmt.h
index 163c0af..3564a73 100644
--- a/src/nmt/nmt.h
+++ b/src/nmt/nmt.h
@@ -3,7 +3,7 @@
#include "../common/compandor.h"
#include "../libdtmf/dtmf_encode.h"
#include "../common/call.h"
-#include "../common/fsk.h"
+#include "../libfsk/fsk.h"
#include "../libgoertzel/goertzel.h"
#include "dms.h"
#include "sms.h"
diff --git a/src/r2000/Makefile.am b/src/r2000/Makefile.am
index d122532..1c763c4 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/libfsk/libfsk.a \
$(top_builddir)/src/libfm/libfm.a \
$(top_builddir)/src/libfilter/libfilter.a \
$(top_builddir)/src/libwave/libwave.a \
diff --git a/src/r2000/r2000.h b/src/r2000/r2000.h
index 41a746a..c9012ea 100644
--- a/src/r2000/r2000.h
+++ b/src/r2000/r2000.h
@@ -2,7 +2,7 @@
#include "../libtimer/timer.h"
#include "../common/sender.h"
#include "../common/call.h"
-#include "../common/fsk.h"
+#include "../libfsk/fsk.h"
enum dsp_mode {
DSP_MODE_OFF, /* no transmission */