Restructure: Move goertzel from common code to 'libgoertzel'
This commit is contained in:
parent
c84318b245
commit
16194c15f9
|
@ -20,6 +20,7 @@ compile
|
||||||
.libs
|
.libs
|
||||||
.dirstamp
|
.dirstamp
|
||||||
m4
|
m4
|
||||||
|
src/libgoertzel/libgoertzel.a
|
||||||
src/libjitter/libjitter.a
|
src/libjitter/libjitter.a
|
||||||
src/libsquelch/libsquelch.a
|
src/libsquelch/libsquelch.a
|
||||||
src/libhagelbarger/libhagelbarger.a
|
src/libhagelbarger/libhagelbarger.a
|
||||||
|
|
|
@ -75,6 +75,7 @@ AS_IF([test "x$with_soapy" == "xyes"],[AC_MSG_NOTICE( Compiling with SoapySDR su
|
||||||
AS_IF([test "x$somethingmagick" == "xyes"],[AC_MSG_NOTICE( Compiling with ImageMagick )],[AC_MSG_NOTICE( ImageMagick not supported )])
|
AS_IF([test "x$somethingmagick" == "xyes"],[AC_MSG_NOTICE( Compiling with ImageMagick )],[AC_MSG_NOTICE( ImageMagick not supported )])
|
||||||
|
|
||||||
AC_OUTPUT(
|
AC_OUTPUT(
|
||||||
|
src/libgoertzel/Makefile
|
||||||
src/libjitter/Makefile
|
src/libjitter/Makefile
|
||||||
src/libsquelch/Makefile
|
src/libsquelch/Makefile
|
||||||
src/libhagelbarger/Makefile
|
src/libhagelbarger/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
AUTOMAKE_OPTIONS = foreign
|
AUTOMAKE_OPTIONS = foreign
|
||||||
SUBDIRS = libjitter libsquelch libhagelbarger libdtmf libgermanton libtimer libsamplerate libscrambler libfilter libwave common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
|
SUBDIRS = libgoertzel libjitter libsquelch libhagelbarger libdtmf libgermanton libtimer libsamplerate libscrambler libfilter libwave common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
|
||||||
|
|
||||||
|
|
|
@ -26,6 +26,7 @@ amps_SOURCES = \
|
||||||
amps_LDADD = \
|
amps_LDADD = \
|
||||||
$(COMMON_LA) \
|
$(COMMON_LA) \
|
||||||
libamps.a \
|
libamps.a \
|
||||||
|
$(top_builddir)/src/libgoertzel/libgoertzel.a \
|
||||||
$(top_builddir)/src/libjitter/libjitter.a \
|
$(top_builddir)/src/libjitter/libjitter.a \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "../common/goertzel.h"
|
#include "../libgoertzel/goertzel.h"
|
||||||
#include "../common/sender.h"
|
#include "../common/sender.h"
|
||||||
#include "../libtimer/timer.h"
|
#include "../libtimer/timer.h"
|
||||||
#include "../common/compandor.h"
|
#include "../common/compandor.h"
|
||||||
|
|
|
@ -11,6 +11,7 @@ anetz_SOURCES = \
|
||||||
main.c
|
main.c
|
||||||
anetz_LDADD = \
|
anetz_LDADD = \
|
||||||
$(COMMON_LA) \
|
$(COMMON_LA) \
|
||||||
|
$(top_builddir)/src/libgoertzel/libgoertzel.a \
|
||||||
$(top_builddir)/src/libjitter/libjitter.a \
|
$(top_builddir)/src/libjitter/libjitter.a \
|
||||||
$(top_builddir)/src/libsquelch/libsquelch.a \
|
$(top_builddir)/src/libsquelch/libsquelch.a \
|
||||||
$(top_builddir)/src/libgermanton/libgermanton.a \
|
$(top_builddir)/src/libgermanton/libgermanton.a \
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#include "../libsquelch/squelch.h"
|
#include "../libsquelch/squelch.h"
|
||||||
#include "../common/goertzel.h"
|
#include "../libgoertzel/goertzel.h"
|
||||||
#include "../common/sender.h"
|
#include "../common/sender.h"
|
||||||
|
|
||||||
enum dsp_mode {
|
enum dsp_mode {
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
#include "../common/sample.h"
|
#include "../common/sample.h"
|
||||||
#include "../common/debug.h"
|
#include "../common/debug.h"
|
||||||
#include "../common/call.h"
|
#include "../common/call.h"
|
||||||
#include "../common/goertzel.h"
|
|
||||||
#include "bnetz.h"
|
#include "bnetz.h"
|
||||||
#include "dsp.h"
|
#include "dsp.h"
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,6 @@ libcommon_a_SOURCES = \
|
||||||
sample.c \
|
sample.c \
|
||||||
debug.c \
|
debug.c \
|
||||||
sound_alsa.c \
|
sound_alsa.c \
|
||||||
goertzel.c \
|
|
||||||
emphasis.c \
|
emphasis.c \
|
||||||
compandor.c \
|
compandor.c \
|
||||||
fft.c \
|
fft.c \
|
||||||
|
|
|
@ -12,6 +12,7 @@ jtacs_SOURCES = \
|
||||||
jtacs_LDADD = \
|
jtacs_LDADD = \
|
||||||
$(COMMON_LA) \
|
$(COMMON_LA) \
|
||||||
../amps/libamps.a \
|
../amps/libamps.a \
|
||||||
|
$(top_builddir)/src/libgoertzel/libgoertzel.a \
|
||||||
$(top_builddir)/src/libjitter/libjitter.a \
|
$(top_builddir)/src/libjitter/libjitter.a \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
|
||||||
|
|
||||||
|
noinst_LIBRARIES = libgoertzel.a
|
||||||
|
|
||||||
|
libgoertzel_a_SOURCES = \
|
||||||
|
goertzel.c
|
|
@ -22,8 +22,8 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "sample.h"
|
#include "../common/sample.h"
|
||||||
#include "debug.h"
|
#include "../common/debug.h"
|
||||||
#include "goertzel.h"
|
#include "goertzel.h"
|
||||||
|
|
||||||
/*
|
/*
|
|
@ -22,6 +22,7 @@ nmt_SOURCES = \
|
||||||
nmt_LDADD = \
|
nmt_LDADD = \
|
||||||
$(COMMON_LA) \
|
$(COMMON_LA) \
|
||||||
libdmssms.a \
|
libdmssms.a \
|
||||||
|
$(top_builddir)/src/libgoertzel/libgoertzel.a \
|
||||||
$(top_builddir)/src/libjitter/libjitter.a \
|
$(top_builddir)/src/libjitter/libjitter.a \
|
||||||
$(top_builddir)/src/libhagelbarger/libhagelbarger.a \
|
$(top_builddir)/src/libhagelbarger/libhagelbarger.a \
|
||||||
$(top_builddir)/src/libdtmf/libdtmf.a \
|
$(top_builddir)/src/libdtmf/libdtmf.a \
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include "../libdtmf/dtmf_encode.h"
|
#include "../libdtmf/dtmf_encode.h"
|
||||||
#include "../common/call.h"
|
#include "../common/call.h"
|
||||||
#include "../common/fsk.h"
|
#include "../common/fsk.h"
|
||||||
#include "../common/goertzel.h"
|
#include "../libgoertzel/goertzel.h"
|
||||||
#include "dms.h"
|
#include "dms.h"
|
||||||
#include "sms.h"
|
#include "sms.h"
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ tacs_SOURCES = \
|
||||||
tacs_LDADD = \
|
tacs_LDADD = \
|
||||||
$(COMMON_LA) \
|
$(COMMON_LA) \
|
||||||
../amps/libamps.a \
|
../amps/libamps.a \
|
||||||
|
$(top_builddir)/src/libgoertzel/libgoertzel.a \
|
||||||
$(top_builddir)/src/libjitter/libjitter.a \
|
$(top_builddir)/src/libjitter/libjitter.a \
|
||||||
$(top_builddir)/src/common/libmobile.a \
|
$(top_builddir)/src/common/libmobile.a \
|
||||||
$(top_builddir)/src/common/libcommon.a \
|
$(top_builddir)/src/common/libcommon.a \
|
||||||
|
|
Loading…
Reference in New Issue