aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am2
-rw-r--r--src/anetz/Makefile.am1
-rw-r--r--src/anetz/anetz.h2
-rw-r--r--src/bnetz/Makefile.am1
-rw-r--r--src/bnetz/bnetz.h2
-rw-r--r--src/common/Makefile.am3
-rw-r--r--src/libsquelch/Makefile.am6
-rw-r--r--src/libsquelch/squelch.c (renamed from src/common/squelch.c)2
-rw-r--r--src/libsquelch/squelch.h (renamed from src/common/squelch.h)0
11 files changed, 15 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 9fdea72..11dad51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ compile
.libs
.dirstamp
m4
+src/libsquelch/libsquelch.a
src/libhagelbarger/libhagelbarger.a
src/libdtmf/libdtmf.a
src/libgermanton/libgermanton.a
diff --git a/configure.ac b/configure.ac
index 092bd4d..5076aee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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 )])
AC_OUTPUT(
+ src/libsquelch/Makefile
src/libhagelbarger/Makefile
src/libdtmf/Makefile
src/libgermanton/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 70755da..0d379b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
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
diff --git a/src/anetz/Makefile.am b/src/anetz/Makefile.am
index 3df8889..5711ba6 100644
--- a/src/anetz/Makefile.am
+++ b/src/anetz/Makefile.am
@@ -11,6 +11,7 @@ anetz_SOURCES = \
main.c
anetz_LDADD = \
$(COMMON_LA) \
+ $(top_builddir)/src/libsquelch/libsquelch.a \
$(top_builddir)/src/libgermanton/libgermanton.a \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
diff --git a/src/anetz/anetz.h b/src/anetz/anetz.h
index 9328115..a4d2d6b 100644
--- a/src/anetz/anetz.h
+++ b/src/anetz/anetz.h
@@ -1,4 +1,4 @@
-#include "../common/squelch.h"
+#include "../libsquelch/squelch.h"
#include "../common/goertzel.h"
#include "../common/sender.h"
diff --git a/src/bnetz/Makefile.am b/src/bnetz/Makefile.am
index c9f3978..5cd86b8 100644
--- a/src/bnetz/Makefile.am
+++ b/src/bnetz/Makefile.am
@@ -13,6 +13,7 @@ bnetz_SOURCES = \
main.c
bnetz_LDADD = \
$(COMMON_LA) \
+ $(top_builddir)/src/libsquelch/libsquelch.a \
$(top_builddir)/src/libgermanton/libgermanton.a \
$(top_builddir)/src/common/libmobile.a \
$(top_builddir)/src/common/libcommon.a \
diff --git a/src/bnetz/bnetz.h b/src/bnetz/bnetz.h
index 07ebae0..a84bc8c 100644
--- a/src/bnetz/bnetz.h
+++ b/src/bnetz/bnetz.h
@@ -1,4 +1,4 @@
-#include "../common/squelch.h"
+#include "../libsquelch/squelch.h"
#include "../common/fsk.h"
#include "../common/sender.h"
#include "../libtimer/timer.h"
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index f47ce13..443823d 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -14,8 +14,7 @@ libcommon_a_SOURCES = \
fm_modulation.c \
fsk.c \
display_wave.c \
- display_measurements.c \
- squelch.c
+ display_measurements.c
libmobile_a_SOURCES = \
sender.c \
diff --git a/src/libsquelch/Makefile.am b/src/libsquelch/Makefile.am
new file mode 100644
index 0000000..1f5e025
--- /dev/null
+++ b/src/libsquelch/Makefile.am
@@ -0,0 +1,6 @@
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+
+noinst_LIBRARIES = libsquelch.a
+
+libsquelch_a_SOURCES = \
+ squelch.c
diff --git a/src/common/squelch.c b/src/libsquelch/squelch.c
index 97188c7..4337ba8 100644
--- a/src/common/squelch.c
+++ b/src/libsquelch/squelch.c
@@ -19,7 +19,7 @@
#include <string.h>
#include <math.h>
-#include "debug.h"
+#include "../common/debug.h"
#include "squelch.h"
#define CHAN squelch->chan
diff --git a/src/common/squelch.h b/src/libsquelch/squelch.h
index 45de690..45de690 100644
--- a/src/common/squelch.h
+++ b/src/libsquelch/squelch.h