From 083ea4edaab0ea5b0c9c2aedd1483be4ec97bc5b Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Thu, 16 Nov 2017 21:04:23 +0100 Subject: [PATCH] Restructure: Move fsk from common code to 'libfsk' --- .gitignore | 1 + configure.ac | 1 + src/Makefile.am | 2 +- src/bnetz/Makefile.am | 1 + src/bnetz/bnetz.h | 2 +- src/common/Makefile.am | 1 - src/libfsk/Makefile.am | 6 ++++++ src/{common => libfsk}/fsk.c | 0 src/{common => libfsk}/fsk.h | 0 src/nmt/Makefile.am | 1 + src/nmt/nmt.h | 2 +- src/r2000/Makefile.am | 1 + src/r2000/r2000.h | 2 +- 13 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 src/libfsk/Makefile.am rename src/{common => libfsk}/fsk.c (100%) rename src/{common => libfsk}/fsk.h (100%) 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 similarity index 100% rename from src/common/fsk.c rename to src/libfsk/fsk.c diff --git a/src/common/fsk.h b/src/libfsk/fsk.h similarity index 100% rename from src/common/fsk.h rename to 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 */