Restructure: Move squelch from common code to 'libsquelch'
This commit is contained in:
parent
60ffdcaf53
commit
8f6d0752df
|
@ -20,6 +20,7 @@ compile
|
||||||
.libs
|
.libs
|
||||||
.dirstamp
|
.dirstamp
|
||||||
m4
|
m4
|
||||||
|
src/libsquelch/libsquelch.a
|
||||||
src/libhagelbarger/libhagelbarger.a
|
src/libhagelbarger/libhagelbarger.a
|
||||||
src/libdtmf/libdtmf.a
|
src/libdtmf/libdtmf.a
|
||||||
src/libgermanton/libgermanton.a
|
src/libgermanton/libgermanton.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/libsquelch/Makefile
|
||||||
src/libhagelbarger/Makefile
|
src/libhagelbarger/Makefile
|
||||||
src/libdtmf/Makefile
|
src/libdtmf/Makefile
|
||||||
src/libgermanton/Makefile
|
src/libgermanton/Makefile
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
AUTOMAKE_OPTIONS = foreign
|
AUTOMAKE_OPTIONS = foreign
|
||||||
SUBDIRS = libhagelbarger libdtmf libgermanton libtimer libsamplerate libscrambler libfilter libwave common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
|
SUBDIRS = libsquelch libhagelbarger libdtmf libgermanton libtimer libsamplerate libscrambler libfilter libwave common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@ anetz_SOURCES = \
|
||||||
main.c
|
main.c
|
||||||
anetz_LDADD = \
|
anetz_LDADD = \
|
||||||
$(COMMON_LA) \
|
$(COMMON_LA) \
|
||||||
|
$(top_builddir)/src/libsquelch/libsquelch.a \
|
||||||
$(top_builddir)/src/libgermanton/libgermanton.a \
|
$(top_builddir)/src/libgermanton/libgermanton.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/squelch.h"
|
#include "../libsquelch/squelch.h"
|
||||||
#include "../common/goertzel.h"
|
#include "../common/goertzel.h"
|
||||||
#include "../common/sender.h"
|
#include "../common/sender.h"
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ bnetz_SOURCES = \
|
||||||
main.c
|
main.c
|
||||||
bnetz_LDADD = \
|
bnetz_LDADD = \
|
||||||
$(COMMON_LA) \
|
$(COMMON_LA) \
|
||||||
|
$(top_builddir)/src/libsquelch/libsquelch.a \
|
||||||
$(top_builddir)/src/libgermanton/libgermanton.a \
|
$(top_builddir)/src/libgermanton/libgermanton.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/squelch.h"
|
#include "../libsquelch/squelch.h"
|
||||||
#include "../common/fsk.h"
|
#include "../common/fsk.h"
|
||||||
#include "../common/sender.h"
|
#include "../common/sender.h"
|
||||||
#include "../libtimer/timer.h"
|
#include "../libtimer/timer.h"
|
||||||
|
|
|
@ -14,8 +14,7 @@ libcommon_a_SOURCES = \
|
||||||
fm_modulation.c \
|
fm_modulation.c \
|
||||||
fsk.c \
|
fsk.c \
|
||||||
display_wave.c \
|
display_wave.c \
|
||||||
display_measurements.c \
|
display_measurements.c
|
||||||
squelch.c
|
|
||||||
|
|
||||||
libmobile_a_SOURCES = \
|
libmobile_a_SOURCES = \
|
||||||
sender.c \
|
sender.c \
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
|
||||||
|
|
||||||
|
noinst_LIBRARIES = libsquelch.a
|
||||||
|
|
||||||
|
libsquelch_a_SOURCES = \
|
||||||
|
squelch.c
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "debug.h"
|
#include "../common/debug.h"
|
||||||
#include "squelch.h"
|
#include "squelch.h"
|
||||||
|
|
||||||
#define CHAN squelch->chan
|
#define CHAN squelch->chan
|
Loading…
Reference in New Issue