Restructure: Move jitter from common code to 'libjitter'

src/Makefile.am

@@ -1,3 +1,3 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = libsquelch libhagelbarger libdtmf libgermanton libtimer libsamplerate libscrambler libfilter libwave common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
+SUBDIRS = libjitter libsquelch libhagelbarger libdtmf libgermanton libtimer libsamplerate libscrambler libfilter libwave common anetz bnetz cnetz nmt amps tacs jtacs r2000 tv test
 

src/amps/Makefile.am

@@ -26,6 +26,7 @@ amps_SOURCES = \
 amps_LDADD = \
 	$(COMMON_LA) \
 	libamps.a \
+	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \

src/anetz/Makefile.am

@@ -11,6 +11,7 @@ anetz_SOURCES = \
 	main.c
 anetz_LDADD = \
 	$(COMMON_LA) \
+	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libsquelch/libsquelch.a \
 	$(top_builddir)/src/libgermanton/libgermanton.a \
 	$(top_builddir)/src/common/libmobile.a \

src/bnetz/Makefile.am

@@ -13,6 +13,7 @@ bnetz_SOURCES = \
 	main.c
 bnetz_LDADD = \
 	$(COMMON_LA) \
+	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libsquelch/libsquelch.a \
 	$(top_builddir)/src/libgermanton/libgermanton.a \
 	$(top_builddir)/src/common/libmobile.a \

src/cnetz/Makefile.am

@@ -16,6 +16,7 @@ cnetz_SOURCES = \
 	main.c
 cnetz_LDADD = \
 	$(COMMON_LA) \
+	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libgermanton/libgermanton.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \

src/common/Makefile.am

@@ -7,7 +7,6 @@ libcommon_a_SOURCES = \
 	debug.c \
 	sound_alsa.c \
 	goertzel.c \
-	jitter.c \
 	emphasis.c \
 	compandor.c \
 	fft.c \

src/common/mncc_console.c

@@ -26,7 +26,7 @@
 #include <sys/time.h>
 #include "sample.h"
 #include "../libsamplerate/samplerate.h"
-#include "jitter.h"
+#include "../libjitter/jitter.h"
 #include "debug.h"
 #include "testton.h"
 #include "mncc.h"

src/common/sender.h

@@ -4,7 +4,7 @@
 #endif
 #include "../libwave/wave.h"
 #include "../libsamplerate/samplerate.h"
-#include "jitter.h"
+#include "../libjitter/jitter.h"
 #include "emphasis.h"
 #include "display.h"
 

src/jtacs/Makefile.am

@@ -12,6 +12,7 @@ jtacs_SOURCES = \
 jtacs_LDADD = \
 	$(COMMON_LA) \
 	../amps/libamps.a \
+	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \

src/libjitter/Makefile.am

@@ -0,0 +1,6 @@
+AM_CPPFLAGS = -Wall -Wextra -g $(all_includes)
+
+noinst_LIBRARIES = libjitter.a
+
+libjitter_a_SOURCES = \
+	jitter.c

src/libjitter/jitter.c

@@ -22,8 +22,8 @@
 #include <string.h>
 #include <errno.h>
 #include <math.h>
-#include "sample.h"
-#include "debug.h"
+#include "../common/sample.h"
+#include "../common/debug.h"
 #include "jitter.h"
 
 /* create jitter buffer */

src/nmt/Makefile.am

@@ -22,6 +22,7 @@ nmt_SOURCES = \
 nmt_LDADD = \
 	$(COMMON_LA) \
 	libdmssms.a \
+	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libhagelbarger/libhagelbarger.a \
 	$(top_builddir)/src/libdtmf/libdtmf.a \
 	$(top_builddir)/src/common/libmobile.a \

src/r2000/Makefile.am

@@ -12,6 +12,7 @@ radiocom2000_SOURCES = \
 	main.c
 radiocom2000_LDADD = \
 	$(COMMON_LA) \
+	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libhagelbarger/libhagelbarger.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \

src/tacs/Makefile.am

@@ -13,6 +13,7 @@ tacs_SOURCES = \
 tacs_LDADD = \
 	$(COMMON_LA) \
 	../amps/libamps.a \
+	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
 	$(top_builddir)/src/libtimer/libtimer.a \

src/test/Makefile.am

@@ -15,6 +15,7 @@ test_filter_LDADD = \
 	$(COMMON_LA) \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
@@ -41,6 +42,7 @@ test_emphasis_LDADD = \
 	$(COMMON_LA) \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
@@ -57,6 +59,7 @@ test_dms_LDADD = \
 	$(top_builddir)/src/nmt/libdmssms.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \
@@ -73,6 +76,7 @@ test_sms_LDADD = \
 	$(top_builddir)/src/nmt/libdmssms.a \
 	$(top_builddir)/src/common/libmobile.a \
 	$(top_builddir)/src/common/libcommon.a \
+	$(top_builddir)/src/libjitter/libjitter.a \
 	$(top_builddir)/src/libtimer/libtimer.a \
 	$(top_builddir)/src/libsamplerate/libsamplerate.a \
 	$(top_builddir)/src/libfilter/libfilter.a \