Restructure: Move fsk from common code to 'libfsk'

pull/1/head
Andreas Eversberg 5 years ago
parent f4754dcb37
commit 083ea4edaa
  1. 1
      .gitignore
  2. 1
      configure.ac
  3. 2
      src/Makefile.am
  4. 1
      src/bnetz/Makefile.am
  5. 2
      src/bnetz/bnetz.h
  6. 1
      src/common/Makefile.am
  7. 6
      src/libfsk/Makefile.am
  8. 0
      src/libfsk/fsk.c
  9. 0
      src/libfsk/fsk.h
  10. 1
      src/nmt/Makefile.am
  11. 2
      src/nmt/nmt.h
  12. 1
      src/r2000/Makefile.am
  13. 2
      src/r2000/r2000.h

1
.gitignore vendored

@ -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

@ -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

@ -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

@ -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 \

@ -1,5 +1,5 @@
#include "../libsquelch/squelch.h"
#include "../common/fsk.h"
#include "../libfsk/fsk.h"
#include "../common/sender.h"
#include "../libtimer/timer.h"

@ -7,7 +7,6 @@ libcommon_a_SOURCES = \
debug.c \
sound_alsa.c \
compandor.c \
fsk.c \
display_wave.c \
display_measurements.c

@ -0,0 +1,6 @@
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
noinst_LIBRARIES = libfsk.a
libfsk_a_SOURCES = \
fsk.c

@ -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 \

@ -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"

@ -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 \

@ -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 */

Loading…
Cancel
Save